Update mkl to 2020.2.254 (#52964)
Summary:
Fixes https://github.com/pytorch/pytorch/issues/52907
Pull Request resolved: https://github.com/pytorch/pytorch/pull/52964
Reviewed By: H-Huang
Differential Revision: D26726464
Pulled By: seemethere
fbshipit-source-id: 8f3067292e6416e299b4b040c8fb73510134f02e
diff --git a/.jenkins/pytorch/win-test-helpers/installation-helpers/install_mkl.bat b/.jenkins/pytorch/win-test-helpers/installation-helpers/install_mkl.bat
index 656a549..c65aa36 100644
--- a/.jenkins/pytorch/win-test-helpers/installation-helpers/install_mkl.bat
+++ b/.jenkins/pytorch/win-test-helpers/installation-helpers/install_mkl.bat
@@ -1,8 +1,8 @@
if "%REBUILD%"=="" (
if "%BUILD_ENVIRONMENT%"=="" (
- curl --retry 3 -k https://s3.amazonaws.com/ossci-windows/mkl_2020.0.166.7z --output %TMP_DIR_WIN%\mkl.7z
+ curl --retry 3 -k https://s3.amazonaws.com/ossci-windows/mkl_2020.2.254.7z --output %TMP_DIR_WIN%\mkl.7z
) else (
- aws s3 cp s3://ossci-windows/mkl_2020.0.166.7z %TMP_DIR_WIN%\mkl.7z --quiet
+ aws s3 cp s3://ossci-windows/mkl_2020.2.254.7z %TMP_DIR_WIN%\mkl.7z --quiet
)
7z x -aoa %TMP_DIR_WIN%\mkl.7z -o%TMP_DIR_WIN%\mkl
)
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
index 18fee10..9a9b928 100644
--- a/caffe2/CMakeLists.txt
+++ b/caffe2/CMakeLists.txt
@@ -1062,7 +1062,12 @@
message(STATUS "pytorch is compiling with OpenMP. \n"
"OpenMP CXX_FLAGS: ${OpenMP_CXX_FLAGS}. \n"
"OpenMP libraries: ${OpenMP_CXX_LIBRARIES}.")
- target_compile_options(torch_cpu PRIVATE ${OpenMP_CXX_FLAGS})
+ if(UNIX)
+ separate_arguments(OpenMP_CXX_OPTIONS UNIX_COMMAND "${OpenMP_CXX_FLAGS}")
+ else()
+ separate_arguments(OpenMP_CXX_OPTIONS WINDOWS_COMMAND "${OpenMP_CXX_FLAGS}")
+ endif()
+ target_compile_options(torch_cpu PRIVATE ${OpenMP_CXX_OPTIONS})
target_link_libraries(torch_cpu PRIVATE ${OpenMP_CXX_LIBRARIES})
endif()
diff --git a/cmake/Modules/FindOpenMP.cmake b/cmake/Modules/FindOpenMP.cmake
index 8ec0b44..40261a7 100644
--- a/cmake/Modules/FindOpenMP.cmake
+++ b/cmake/Modules/FindOpenMP.cmake
@@ -101,7 +101,7 @@
set(OMP_FLAG_Intel "-qopenmp")
endif()
set(OMP_FLAG_MIPSpro "-mp")
- set(OMP_FLAG_MSVC "-openmp:experimental" "-openmp")
+ set(OMP_FLAG_MSVC "-openmp:experimental" "-openmp:experimental -I${__header_dir}" "-openmp" "-openmp -I${__header_dir}")
set(OMP_FLAG_PathScale "-openmp")
set(OMP_FLAG_NAG "-openmp")
set(OMP_FLAG_Absoft "-openmp")
@@ -132,6 +132,7 @@
int main(void) {
#ifdef _OPENMP
omp_get_max_threads();
+ omp_get_level();
return 0;
#else
breaks_on_purpose
diff --git a/docs/source/notes/windows.rst b/docs/source/notes/windows.rst
index cc195e7..15aaf1b 100644
--- a/docs/source/notes/windows.rst
+++ b/docs/source/notes/windows.rst
@@ -15,8 +15,8 @@
REM Make sure you have 7z and curl installed.
REM Download MKL files
- curl https://s3.amazonaws.com/ossci-windows/mkl_2020.0.166.7z -k -O
- 7z x -aoa mkl_2020.0.166.7z -omkl
+ curl https://s3.amazonaws.com/ossci-windows/mkl_2020.2.254.7z -k -O
+ 7z x -aoa mkl_2020.2.254.7z -omkl
REM Download MAGMA files
REM version available:
