Merge pull request #490 from sony/feature/20231122-add-exclude-funcset

limit pytest version
sony · Nov 30, 2023 · d1281c6 · d1281c6
2 parents 3e05a2b + 8ea266c
commit d1281c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/build-tools/msvc/test.bat b/build-tools/msvc/test.bat
@@ -34,7 +34,7 @@ IF NOT DEFINED WHLCUDA (
 
 pip install %PIP_INS_OPTS% %WHL% || GOTO :error
 pip install %PIP_INS_OPTS% --no-deps %WHLCUDA% || GOTO :error
-pip install %PIP_INS_OPTS% pytest pytest-xdist[psutil]
+pip install %PIP_INS_OPTS% pytest pytest-xdist[psutil]~=3.3.1
 
 SET PYTHONPATH=%nnabla_ext_cuda_root%\python\test;%VENV%\Lib\site-packages;%PYTHONPATH%
 python -m pytest %PYTEST_OPTS% %nnabla_root%\python\test || GOTO :error

diff --git a/docker/development/Dockerfile.build-mpi b/docker/development/Dockerfile.build-mpi
@@ -143,7 +143,7 @@ RUN eval ${DNF_OPTS} \
        sqlite-devel \
        tk-devel \
        numactl-libs \
-    && if [ "${BUILD_WITH_CUTENSOR}" == "True" ]; then dnf install -y libcutensor-devel; fi \
+    && if [ "${BUILD_WITH_CUTENSOR}" == "True" ]; then dnf install -y libcutensor-devel-1.7.0.1; fi \
     && dnf group install -y "Development Tools" \
     && dnf clean all
 

diff --git a/docker/development/Dockerfile.build-mpi-ppc64le b/docker/development/Dockerfile.build-mpi-ppc64le
@@ -107,7 +107,7 @@ RUN eval ${DNF_OPTS} \
        sqlite-devel \
        tk-devel \
        xz-devel \
-    && if [ "${BUILD_WITH_CUTENSOR}" == "True" ]; then dnf install -y libcutensor-devel; fi \
+    && if [ "${BUILD_WITH_CUTENSOR}" == "True" ]; then dnf install -y libcutensor-devel-1.7.0.1; fi \
     && dnf group install -y "Development Tools" \
     && dnf clean all
 

diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
@@ -72,7 +72,9 @@ endif()
 
 if(UNIX)
   set(cutensor_default_path /usr/lib64 /usr/lib/x86_64-linux-gnu)
-  if(${CUDA_VERSION} VERSION_GREATER 11.0)
+  if(${CUDA_VERSION} VERSION_GREATER 12.0)
+    set(cutensor_ver 12)
+  elseif(${CUDA_VERSION} VERSION_GREATER 11.0)
     set(cutensor_ver 11)
   else()
     set(cutensor_ver ${CUDA_VERSION})
@@ -85,7 +87,7 @@ if(UNIX)
     endif()
   endforeach()
   if(NOT (DEFINED cutensor_found))
-    set(cutensor_file_name libcutensor-linux-x86_64-1.6.0.3-archive)
+    set(cutensor_file_name libcutensor-linux-x86_64-1.7.0.1-archive)
     if(NOT EXISTS ${CMAKE_SOURCE_DIR}/third_party/${cutensor_file_name})
       download_and_extract_library(${cutensor_file_name} .tar.xz https://developer.download.nvidia.com/compute/cutensor/redist/libcutensor/linux-x86_64/${cutensor_file_name}.tar.xz)
     endif()