From 36e5d48f2cfa206eae03dc996982e97d35197ce5 Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Mon, 4 Mar 2024 04:46:38 +0530 Subject: [PATCH 1/2] update IntelMKL --- src/ansys/mechanical/env/mechanical-env | 3 +++ tests/test_script.py | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ansys/mechanical/env/mechanical-env b/src/ansys/mechanical/env/mechanical-env index d5b070e..135429d 100755 --- a/src/ansys/mechanical/env/mechanical-env +++ b/src/ansys/mechanical/env/mechanical-env @@ -150,18 +150,21 @@ LD_LIBRARY_PATH=${!awp_root}/tp/stdc++\ # Add extra path to the dynamic library load path depending on version if [ "$version" = "242" ]; then # For version 242 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}\ +:${!awp_root}/tp/IntelMKL/2023.1.0/linx64/lib/intel64\ :${!awp_root}/tp/nss/3.89/lib\ :${!awp_root}/tp/IntelCompiler/2023.1.0/linx64/lib/intel64\ :${!awp_root}/tp/qt/5.15.10/linx64/lib\ :${!awp_root}/tp/openssl/3.0/linx64/lib elif [ "$version" = "241" ]; then # For version 241 LD_LIBRARY_PATH=${LD_LIBRARY_PATH}\ +:${!awp_root}/tp/IntelMKL/2020.0.166/linx64/lib/intel64\ :${!awp_root}/tp/nss/3.89/lib\ :${!awp_root}/tp/IntelCompiler/2023.1.0/linx64/lib/intel64\ :${!awp_root}/tp/qt_fw/5.9.6/Linux64/lib\ :${!awp_root}/tp/openssl/1.1.1/linx64/lib else # For version < 241 (mainly 232) LD_LIBRARY_PATH=${LD_LIBRARY_PATH}\ +:${!awp_root}/tp/IntelMKL/2020.0.166/linx64/lib/intel64\ :${!awp_root}/tp/IntelCompiler/2019.3.199/linx64/lib/intel64\ :${!awp_root}/tp/qt_fw/5.9.6/Linux64/lib\ :${!awp_root}/tp/openssl/1.1.1/linx64/lib diff --git a/tests/test_script.py b/tests/test_script.py index df7a20e..75a319a 100644 --- a/tests/test_script.py +++ b/tests/test_script.py @@ -120,7 +120,11 @@ def test_bash_script(version_number): # Assert variable specific to version 242 if version_number == 242: print(version_number) - assert "/tp/openssl/3.0/linx64/lib" and "/tp/qt/5.15.10/linx64/lib" in str(stdout) + assert ( + "/tp/openssl/3.0/linx64/lib" + and "/tp/qt/5.15.10/linx64/lib" + and "/tp/IntelMKL/2023.1.0/linx64/lib/intel64" in str(stdout) + ) # Assert if the script returned successfully assert return_code == 0 From 7c573ebf2e0e10a19b2a8b211b2fc31a51bb6679 Mon Sep 17 00:00:00 2001 From: dkunhamb Date: Mon, 4 Mar 2024 08:53:56 -0600 Subject: [PATCH 2/2] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 80a7c11..3d12628 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ This document follows the conventions laid out in [Keep a CHANGELOG](https://kee ### Fixed ### Changed +- Update intelMKL path for 242 [#40](https://github.com/ansys/pymechanical-env/pull/40) ### Dependencies - Update `pre-commit` [#35](https://github.com/ansys/pymechanical-env/pull/35)