Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Maint : Update IntelMKL #40

Merged
merged 3 commits into from
Mar 4, 2024
Merged

Maint : Update IntelMKL #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36e5d48
update IntelMKL
dipinknair Mar 3, 2024
7c573eb
update changelog
dipinknair Mar 4, 2024
a8fb968
Merge branch 'main' into maint/intelMKL
dipinknair Mar 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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), [#36](https://github.com/ansys/pymechanical-env/pull/36)
Expand Down
3 changes: 3 additions & 0 deletions src/ansys/mechanical/env/mechanical-env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 5 additions & 1 deletion tests/test_script.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading