Merge branch 'master' into ifu

Author: iotamudelta

aten/src/THC/THCSortUtils.cuh

@@ -142,7 +142,7 @@ bitonicSortKVInPlace(TensorInfo<K, IndexType> keys,
                      IndexType keySliceStride,
                      TensorInfo<V, IndexType> values,
                      IndexType valueSliceStride,
-                     const Comparator& comp) {
+                     Comparator comp) {
   // Find the slice of the tensor that we are sorting
   const IndexType linearIndex = getLinearBlockId<IndexType>();
   // Tiling the slices could have us be out of bounds, if there are a

cmake/public/LoadHIP.cmake

@@ -38,6 +38,13 @@ ELSE()
   SET(ROCBLAS_PATH $ENV{ROCBLAS_PATH})
 ENDIF()
 
+# ROCSPARSE_PATH
+IF(NOT DEFINED ENV{ROCSPARSE_PATH})
+  SET(ROCSPARSE_PATH ${ROCM_PATH}/rocsparse)
+ELSE()
+  SET(ROCSPARSE_PATH $ENV{ROCSPARSE_PATH})
+ENDIF()
+
 # ROCFFT_PATH
 IF(NOT DEFINED ENV{ROCFFT_PATH})
   SET(ROCBLAS_PATH ${ROCM_PATH}/rocfft)
@@ -47,7 +54,7 @@ ENDIF()
 
 # HIPSPARSE_PATH
 IF(NOT DEFINED ENV{HIPSPARSE_PATH})
-  SET(HIPSPARSE_PATH ${ROCM_PATH}/hcsparse)
+  SET(HIPSPARSE_PATH ${ROCM_PATH}/hipsparse)
 ELSE()
   SET(HIPSPARSE_PATH $ENV{HIPSPARSE_PATH})
 ENDIF()
@@ -115,12 +122,14 @@ IF(HIP_FOUND)
   set(rocblas_DIR ${ROCBLAS_PATH}/lib/cmake/rocblas)
   set(rocfft_DIR ${ROCFFT_PATH}/lib/cmake/rocfft)
   set(hipsparse_DIR ${HIPSPARSE_PATH}/lib/cmake/hipsparse)
+  set(rocsparse_DIR ${ROCSPARSE_PATH}/lib/cmake/rocsparse)
 
   find_package(rocrand REQUIRED)
   find_package(hiprand REQUIRED)
   find_package(rocblas REQUIRED)
   find_package(rocfft REQUIRED)
   find_package(miopen REQUIRED)
+  #find_package(rocsparse REQUIRED)
   #find_package(hipsparse REQUIRED)
 
   # TODO: hip_hcc has an interface include flag "-hc" which is only
@@ -132,6 +141,7 @@ IF(HIP_FOUND)
   # however currently it's just the lib name
   FIND_LIBRARY(PYTORCH_MIOPEN_LIBRARIES ${miopen_LIBRARIES} HINTS ${MIOPEN_PATH}/lib)
   FIND_LIBRARY(hiprand_LIBRARIES hiprand HINTS ${HIPRAND_PATH}/lib)
+  FIND_LIBRARY(rocsparse_LIBRARIES rocsparse HINTS ${ROCSPARSE_PATH}/lib)
   FIND_LIBRARY(hipsparse_LIBRARIES hipsparse HINTS ${HIPSPARSE_PATH}/lib)
 
 

docker/caffe2/jenkins/common/install_rocm.sh

@@ -50,13 +50,6 @@ install_hip_thrust() {
     git clone --recursive https://github.com/ROCmSoftwarePlatform/cub-hip.git /data/Thrust/thrust/system/cuda/detail/cub-hip
 }
 
-# This will be removed after merging an upcoming PR.
-install_hcsparse() {
-    mkdir -p /opt/rocm/debians
-    curl https://s3.amazonaws.com/ossci-linux/hcsparse-master-907a505-Linux.deb -o /opt/rocm/debians/hcsparse.deb 
-    dpkg -i /opt/rocm/debians/hcsparse.deb
-}
-
 # Install an updated version of rocRand that's PyTorch compatible.
 install_rocrand() {
     mkdir -p /opt/rocm/debians
@@ -73,6 +66,21 @@ install_hipsparse() {
     dpkg -i /opt/rocm/debians/hipsparse.deb
 }
 
+# Install custom hcc containing two compiler fixes relevant to PyTorch
+install_customhcc() {
+    mkdir -p /opt/rocm/debians
+    curl https://s3.amazonaws.com/ossci-linux/hcc-1.2.18272-Linux.deb -o /opt/rocm/debians/hcc-1.2.18272-Linux.deb
+    curl https://s3.amazonaws.com/ossci-linux/hip_base-1.5.18276.deb -o /opt/rocm/debians/hip_base-1.5.18276.deb
+    curl https://s3.amazonaws.com/ossci-linux/hip_doc-1.5.18276.deb -o /opt/rocm/debians/hip_doc-1.5.18276.deb
+    curl https://s3.amazonaws.com/ossci-linux/hip_samples-1.5.18276.deb -o /opt/rocm/debians/hip_samples-1.5.18276.deb
+    curl https://s3.amazonaws.com/ossci-linux/hip_hcc-1.5.18276.deb -o /opt/rocm/debians/hip_hcc-1.5.18276.deb
+    dpkg -i /opt/rocm/debians/hcc-1.2.18272-Linux.deb
+    dpkg -i /opt/rocm/debians/hip_base-1.5.18276.deb
+    dpkg -i /opt/rocm/debians/hip_doc-1.5.18276.deb
+    dpkg -i /opt/rocm/debians/hip_samples-1.5.18276.deb
+    dpkg -i /opt/rocm/debians/hip_hcc-1.5.18276.deb
+}
+
 # Install Python packages depending on the base OS
 if [ -f /etc/lsb-release ]; then
   install_ubuntu
@@ -85,5 +93,5 @@ fi
 
 install_hip_thrust
 install_rocrand
-install_hcsparse
 install_hipsparse
+install_customhcc

setup.py

@@ -943,8 +943,8 @@ def run(self):
     rocm_include_path = '/opt/rocm/include'
     hcc_include_path = '/opt/rocm/hcc/include'
     rocblas_include_path = '/opt/rocm/rocblas/include'
+    hipsparse_include_path = '/opt/rocm/hipsparse/include'
     rocfft_include_path = '/opt/rocm/rocfft/include'
-    hipsparse_include_path = '/opt/rocm/hcsparse/include'
     hiprand_include_path = '/opt/rocm/hiprand/include'
     rocrand_include_path = '/opt/rocm/rocrand/include'
     hip_lib_path = '/opt/rocm/hip/lib'

test/test_nn.py

@@ -5353,6 +5353,7 @@ def test_affine_grid(self):
 
     @unittest.skipIf((not TEST_NUMPY) or (not TEST_SCIPY) or (scipy.__version__ < '1.0.0'),
                      "Scipy v1.0 and/or numpy not found")
+    @skipIfRocm
     def test_affine_2d_rotate0(self):
         # scipy before 1.0.0 do not support homogeneous coordinate
         # scipy.ndimage.affine_transform, so we need to skip.
@@ -5390,6 +5391,7 @@ def test_affine_2d_rotate0(self):
 
     @unittest.skipIf((not TEST_NUMPY) or (not TEST_SCIPY) or (scipy.__version__ < '1.0.0'),
                      "Scipy v1.0 and/or numpy not found")
+    @skipIfRocm
     def test_affine_2d_rotate90(self):
         # scipy before 1.0.0 do not support homogeneous coordinate
         # scipy.ndimage.affine_transform, so we need to skip.
@@ -5435,6 +5437,7 @@ def test_affine_2d_rotate90(self):
 
     @unittest.skipIf((not TEST_NUMPY) or (not TEST_SCIPY) or (scipy.__version__ < '1.0.0'),
                      "Scipy v1.0 and/or numpy not found")
+    @skipIfRocm
     def test_affine_2d_rotate45(self):
         # scipy before 1.0.0 do not support homogeneous coordinate
         # scipy.ndimage.affine_transform, so we need to skip.
@@ -5473,6 +5476,7 @@ def test_affine_2d_rotate45(self):
 
     @unittest.skipIf((not TEST_NUMPY) or (not TEST_SCIPY) or (scipy.__version__ < '1.0.0'),
                      "Scipy v1.0 and/or numpy not found")
+    @skipIfRocm
     def test_affine_2d_rotateRandom(self):
         # scipy before 1.0.0 do not support homogeneous coordinate
         # scipy.ndimage.affine_transform, so we need to skip.
@@ -5521,6 +5525,7 @@ def test_affine_2d_rotateRandom(self):
 
     @unittest.skipIf((not TEST_NUMPY) or (not TEST_SCIPY) or (scipy.__version__ < '1.0.0'),
                      "Scipy v1.0 and/or numpy not found")
+    @skipIfRocm
     def test_affine_3d_rotateRandom(self):
         # scipy before 1.0.0 do not support homogeneous coordinate
         # scipy.ndimage.affine_transform, so we need to skip.

tools/amd_build/pyHIPIFY/cuda_to_hip_mappings.py

@@ -2171,7 +2171,7 @@
 CUDA_SPARSE_MAP = {
     "cusparseStatus_t": ("hipsparseStatus_t", CONV_MATH_FUNC, API_SPARSE),
     "cusparseHandle_t": ("hipsparseHandle_t", CONV_MATH_FUNC, API_SPARSE),
-    "cusparseOperation_t": ("hcsparseOperation_t", CONV_TYPE, API_SPARSE),
+    "cusparseOperation_t": ("hipsparseOperation_t", CONV_TYPE, API_SPARSE),
     "cusparseCreate": ("hipsparseCreate", CONV_MATH_FUNC, API_SPARSE),
     "cusparseDestroy": ("hipsparseDestroy", CONV_MATH_FUNC, API_SPARSE),
     "CUSPARSE_STATUS_SUCCESS": ("HIPSPARSE_STATUS_SUCCESS", CONV_NUMERIC_LITERAL, API_SPARSE),

torch/CMakeLists.txt

@@ -350,7 +350,7 @@ if(USE_ROCM)
     /opt/rocm/include
     /opt/rocm/hcc/include
     /opt/rocm/rocblas/include
-    /opt/rocm/hcsparse/include
+    /opt/rocm/hipsparse/include
     )
 endif()