zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correcting library path of hsakmt-roct for Centos7 and cleaning up the patch file. (#30885)

Browse Source 
* Correcting library path of hsakmt-roct and cleaning up the patch file.

* Delete 007-library-path.patch
This commit is contained in:
renjithravindrankannath 2022-06-06 13:50:41 -07:00 committed by GitHub
parent fb173f80b2
commit ed6695b9c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
var/spack/repos/builtin/packages/rocm-validation-suite/007-library-path.patch → var/spack/repos/builtin/packages/rocm-validation-suite/006-library-path.patch
View File

@ -1,5 +1,5 @@
diff --git a/babel.so/CMakeLists.txt b/babel.so/CMakeLists.txt
index 70d3ebd..c0d0244 100644
index f4e57c7..fb66263 100644
--- a/babel.so/CMakeLists.txt
+++ b/babel.so/CMakeLists.txt
@@ -113,13 +113,13 @@ set(ROCBLAS_LIB "rocblas")
@ -27,13 +27,13 @@ index 70d3ebd..c0d0244 100644
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH/lib/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH} ${HIP_PATH}/include/)
+include_directories(./ ../ ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
@ -42,7 +42,7 @@ index 70d3ebd..c0d0244 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/edp.so/CMakeLists.txt b/edp.so/CMakeLists.txt
index 11a28c3..cc9d0b2 100644
index 851e24c..3697b4f 100644
--- a/edp.so/CMakeLists.txt
+++ b/edp.so/CMakeLists.txt
@@ -108,13 +108,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_HCC_BUILD_FLAGS}")
@ -52,14 +52,14 @@ index 11a28c3..cc9d0b2 100644
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime.h)
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime.h)
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH/include/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
-if(NOT EXISTS ${HIP_INC_DIR}/include/hip/hip_runtime_api.h)
- message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_INC_DIR path. Current value is : " ${HIP_INC_DIR})
+if(NOT EXISTS ${HIP_PATH}/include/hip/hip_runtime_api.h)
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH/include/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime headers can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
@ -70,13 +70,13 @@ index 11a28c3..cc9d0b2 100644
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH/lib/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH} ${ROCBLAS_INC_DIR} ${HIP_PATH}/include/)
+include_directories(./ ../ ${ROCBLAS_INC_DIR} ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR})
+link_directories(${RVS_LIB_DIR} ${ROCBLAS_LIB_DIR})
@ -84,7 +84,7 @@ index 11a28c3..cc9d0b2 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpciaccess.so libpci.so libm.so)
diff --git a/gst.so/CMakeLists.txt b/gst.so/CMakeLists.txt
index 7bc2105..4d742df 100644
index 7ce465a..c61c52b 100644
--- a/gst.so/CMakeLists.txt
+++ b/gst.so/CMakeLists.txt
@@ -117,13 +117,13 @@ else()
@ -112,13 +112,13 @@ index 7bc2105..4d742df 100644
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH/lib/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH} ${ROCBLAS_INC_DIR} ${HIP_PATH}/include/)
+include_directories(./ ../ ${ROCBLAS_INC_DIR} ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
@ -126,7 +126,7 @@ index 7bc2105..4d742df 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/iet.so/CMakeLists.txt b/iet.so/CMakeLists.txt
index cebd6d4..bc814b5 100644
index 278c084..5ba9007 100644
--- a/iet.so/CMakeLists.txt
+++ b/iet.so/CMakeLists.txt
@@ -122,13 +122,13 @@ else()
@ -154,7 +154,7 @@ index cebd6d4..bc814b5 100644
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH/lib/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
@ -163,7 +163,7 @@ index cebd6d4..bc814b5 100644
## define include directories
-include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_PATH} ${HIP_PATH}/include/)
+include_directories(./ ../ ${ROCM_SMI_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ROCM_SMI_LIB_DIR} ${ASAN_LIB_PATH})
@ -171,7 +171,7 @@ index cebd6d4..bc814b5 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/mem.so/CMakeLists.txt b/mem.so/CMakeLists.txt
index 760ca0e..7f94c09 100644
index ec1c01d..c8e040a 100644
--- a/mem.so/CMakeLists.txt
+++ b/mem.so/CMakeLists.txt
@@ -114,13 +114,13 @@ set(ROCBLAS_LIB "rocblas")
@ -199,13 +199,13 @@ index 760ca0e..7f94c09 100644
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set /lib/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH} ${HIP_PATH}/include/)
+include_directories(./ ../ ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
@ -214,7 +214,7 @@ index 760ca0e..7f94c09 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/pebb.so/CMakeLists.txt b/pebb.so/CMakeLists.txt
index b61d4f5..29b45ba 100644
index f88f7c1..f5eb246 100644
--- a/pebb.so/CMakeLists.txt
+++ b/pebb.so/CMakeLists.txt
@@ -135,20 +135,20 @@ else()
@ -237,15 +237,15 @@ index b61d4f5..29b45ba 100644
## define include directories
-include_directories(./ ../ pci ${ROCR_INC_DIR})
+include_directories(./ ../ pci ${HSA_PATH}/include/)
+include_directories(./ ../ pci ${HSA_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/perf.so/CMakeLists.txt b/perf.so/CMakeLists.txt
index 1365891..1996332 100644
index c99b511..35490fc 100644
--- a/perf.so/CMakeLists.txt
+++ b/perf.so/CMakeLists.txt
@@ -117,13 +117,13 @@ else()
@ -273,13 +273,13 @@ index 1365891..1996332 100644
-if(NOT EXISTS "${ROCR_LIB_DIR}/lib${HIP_HCC_LIB}.so")
- message("ERROR: ROC Runtime libraries can't be found under specified path. Please set ROCR_LIB_DIR path. Current value is : " ${ROCR_LIB_DIR})
+if(NOT EXISTS "${HIP_PATH}/lib/lib${HIP_HCC_LIB}.so")
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH/lib/ path. Current value is : " ${HIP_PATH})
+ message("ERROR: ROC Runtime libraries can't be found under specified path. Please set HIP_PATH path. Current value is : " ${HIP_PATH})
RETURN()
endif()
## define include directories
-include_directories(./ ../ ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR})
+include_directories(./ ../ ${HIP_PATH} ${ROCBLAS_INC_DIR} ${HIP_PATH}/include/)
+include_directories(./ ../ ${ROCBLAS_INC_DIR} ${HIP_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HIP_PATH}/lib/ ${ROCBLAS_LIB_DIR} ${ASAN_LIB_PATH})
@ -287,7 +287,7 @@ index 1365891..1996332 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/pesm.so/CMakeLists.txt b/pesm.so/CMakeLists.txt
index 98949c3..ad59b93 100644
index a887606..9bd797d 100644
--- a/pesm.so/CMakeLists.txt
+++ b/pesm.so/CMakeLists.txt
@@ -118,7 +118,7 @@ endif()
@ -300,18 +300,10 @@ index 98949c3..ad59b93 100644
set (PROJECT_LINK_LIBS libpthread.so libpci.so libm.so)
diff --git a/pqt.so/CMakeLists.txt b/pqt.so/CMakeLists.txt
index 1f71fb3..e03c3ef 100644
index d59b254..7cb3743 100644
--- a/pqt.so/CMakeLists.txt
+++ b/pqt.so/CMakeLists.txt
@@ -123,7 +123,6 @@ set(CMAKE_C_COMPILER "${HIPCC_PATH}/bin/hipcc")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HIP_HCC_BUILD_FLAGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HIP_HCC_BUILD_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${ASAN_LD_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ASAN_LD_FLAGS}")
if(BUILD_ADDRESS_SANITIZER)
execute_process(COMMAND ${CMAKE_CXX_COMPILER} --print-file-name=libclang_rt.asan-x86_64.so
@@ -134,20 +133,20 @@ else()
@@ -134,20 +134,20 @@ else()
endif()
# Determine Roc Runtime header files are accessible
@ -331,15 +323,15 @@ index 1f71fb3..e03c3ef 100644
## define include directories
-include_directories(./ ../ pci ${ROCR_INC_DIR})
+include_directories(./ ../ pci ${HSA_PATH}/include/)
+include_directories(./ ../ pci ${HSA_PATH})
# Add directories to look for library files to link
-link_directories(${RVS_LIB_DIR} ${ROCR_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ROCT_LIB_DIR} ${ASAN_LIB_PATH})
+link_directories(${RVS_LIB_DIR} ${HSA_PATH}/lib/ ${HSAKMT_LIB_DIR} ${ASAN_LIB_PATH})
## additional libraries
set (PROJECT_LINK_LIBS rvslibrt rvslib libpthread.so libpci.so libm.so)
diff --git a/rcqt.so/CMakeLists.txt b/rcqt.so/CMakeLists.txt
index 5aabaaa..49e858e 100644
index 072c49d..3f00c7a 100644
--- a/rcqt.so/CMakeLists.txt
+++ b/rcqt.so/CMakeLists.txt
@@ -120,7 +120,7 @@ endif()
@ -352,7 +344,7 @@ index 5aabaaa..49e858e 100644
set (PROJECT_LINK_LIBS rvslibrt rvslib)
diff --git a/rvslib/CMakeLists.txt b/rvslib/CMakeLists.txt
index 642902c..a01b00f 100644
index 642902c..7acaec4 100644
--- a/rvslib/CMakeLists.txt
+++ b/rvslib/CMakeLists.txt
@@ -120,7 +120,7 @@ endif()
@ -360,7 +352,7 @@ index 642902c..a01b00f 100644
## define include directories
include_directories(./ ../
- ${ROCM_SMI_INC_DIR} ${ROCR_INC_DIR} ${ROCBLAS_INC_DIR} ${HIP_INC_DIR}
+ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR} ${HIP_PATH}/include/
+ ${ROCM_SMI_INC_DIR} ${HIP_PATH} ${ROCBLAS_INC_DIR} ${HIP_PATH}
)
link_directories(${ASAN_LIB_PATH})

7
var/spack/repos/builtin/packages/rocm-validation-suite/package.py
View File

@ -44,7 +44,7 @@ class RocmValidationSuite(CMakePackage):
patch('003-cmake-change-to-remove-installs-and-sudo.patch', when='@4.1.0:4.3.2')
patch('004-remove-git-download-yaml-cpp-use-yaml-cpp-recipe.patch', when='@4.3.0:4.3.2')
patch('005-cleanup-path-reference-donot-download-googletest-yaml.patch', when='@4.5.0:')
patch('007-library-path.patch', when='@4.5.0:')
patch('006-library-path.patch', when='@4.5.0:')
depends_on('cmake@3.5:', type='build')
depends_on('zlib', type='link')
@ -76,7 +76,6 @@ def cmake_args(self):
args = [
self.define('HIP_PATH', self.spec['hip'].prefix),
self.define('HSA_PATH', self.spec['hsa-rocr-dev'].prefix),
self.define('HSAKMT_LIB_DIR', self.spec['hsakmt-roct'].prefix.lib),
self.define('ROCM_SMI_DIR', self.spec['rocm-smi-lib'].prefix),
self.define('ROCBLAS_DIR', self.spec['rocblas'].prefix),
self.define('YAML_INC_DIR', self.spec['yaml-cpp'].prefix.include),
@ -88,4 +87,8 @@ def cmake_args(self):
if not os.path.isdir(libloc):
libloc = self.spec['googletest'].prefix.lib
args.append(self.define('UT_LIB', libloc))
libloc = self.spec['hsakmt-roct'].prefix.lib64
if not os.path.isdir(libloc):
libloc = self.spec['hsakmt-roct'].prefix.lib
args.append(self.define('HSAKMT_LIB_DIR', libloc))
return args