diff options
| author | Tomoki, Karatsu <49965247+t-karatsu@users.noreply.github.com> | 2020-05-27 16:32:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 09:32:11 +0200 |
| commit | 6b8775f6afacc65378fd733f33ad9d6bbe9fe6d7 (patch) | |
| tree | 89bb67c2e8f957c56abf777d5e7735c74e750ec3 | |
| parent | fcacf8dc9d6a989b61047f25441386b7811f65dc (diff) | |
| download | spack-6b8775f6afacc65378fd733f33ad9d6bbe9fe6d7.tar.gz spack-6b8775f6afacc65378fd733f33ad9d6bbe9fe6d7.tar.bz2 spack-6b8775f6afacc65378fd733f33ad9d6bbe9fe6d7.tar.xz spack-6b8775f6afacc65378fd733f33ad9d6bbe9fe6d7.zip | |
py-torch: find openmp when %fj (#16822)
Fix for 'FindOpenMP.cmake' to detect openmp
settings used by Fujitsu compiler.
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torch/detect_omp_of_fujitsu_compiler.patch | 20 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/py-torch/package.py | 4 |
2 files changed, 24 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/py-torch/detect_omp_of_fujitsu_compiler.patch b/var/spack/repos/builtin/packages/py-torch/detect_omp_of_fujitsu_compiler.patch new file mode 100644 index 0000000000..519d66869d --- /dev/null +++ b/var/spack/repos/builtin/packages/py-torch/detect_omp_of_fujitsu_compiler.patch @@ -0,0 +1,20 @@ +--- pytorch/cmake/Modules/FindOpenMP.cmake.org 2020-05-26 17:43:53.000000000 +0900 ++++ pytorch/cmake/Modules/FindOpenMP.cmake 2020-05-26 17:46:37.000000000 +0900 +@@ -84,7 +84,7 @@ + unset(OpenMP_FLAG_CANDIDATES) + + set(OMP_FLAG_GNU "-fopenmp") +- set(OMP_FLAG_Clang "-fopenmp=libomp" "-fopenmp=libiomp5" "-fopenmp") ++ set(OMP_FLAG_Clang "-fopenmp" "-fopenmp=libomp" "-fopenmp=libiomp5") + + # AppleClang may need a header file, search for omp.h with hints to brew + # default include dir +@@ -245,7 +245,7 @@ + set(OpenMP_libomp_LIBRARY "${MKL_OPENMP_LIBRARY}" CACHE STRING "libomp location for OpenMP") + else() + find_library(OpenMP_libomp_LIBRARY +- NAMES omp gomp iomp5 ++ NAMES fjomp omp gomp iomp5 + HINTS ${CMAKE_${LANG}_IMPLICIT_LINK_DIRECTORIES} + DOC "libomp location for OpenMP" + ) diff --git a/var/spack/repos/builtin/packages/py-torch/package.py b/var/spack/repos/builtin/packages/py-torch/package.py index ce69a5581c..eb2eec608c 100644 --- a/var/spack/repos/builtin/packages/py-torch/package.py +++ b/var/spack/repos/builtin/packages/py-torch/package.py @@ -178,6 +178,10 @@ class PyTorch(PythonPackage, CudaPackage): sha256='7781c7ec0a661bf5a946a659f80e90df9dba116ad168762f15b10547113ae600', when='@1.1:1.5') + # Fix for 'FindOpenMP.cmake' + # to detect openmp settings used by Fujitsu compiler. + patch('detect_omp_of_fujitsu_compiler.patch', when='%fj') + # Both build and install run cmake/make/make install # Only run once to speed up build times phases = ['install'] |