diff options
58 files changed, 582 insertions, 165 deletions
diff --git a/lib/spack/spack/compilers/xl.py b/lib/spack/spack/compilers/xl.py index 9f23e4e954..c87f28e78d 100644 --- a/lib/spack/spack/compilers/xl.py +++ b/lib/spack/spack/compilers/xl.py @@ -73,14 +73,6 @@ class Xl(Compiler): raise UnsupportedCompilerFlag(self, "the C11 standard", "c11_flag", "< 12.1") @property - def cxx14_flag(self): - # .real_version does not have the "y.z" component of "w.x.y.z", which - # is required to distinguish whether support is available - if self.version >= ver("16.1.1.8"): - return "-std=c++14" - raise UnsupportedCompilerFlag(self, "the C++14 standard", "cxx14_flag", "< 16.1.1.8") - - @property def cc_pic_flag(self): return "-qpic" diff --git a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml index 074cb42801..d64d0f2980 100644 --- a/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml +++ b/share/spack/gitlab/cloud_pipelines/stacks/e4s-oneapi/spack.yaml @@ -223,14 +223,16 @@ spack: # flux-sched: include/yaml-cpp/emitter.h:171:24: error: comparison with infinity always evaluates to false in fast floating point modes [-Werror,-Wtautological-constant-compare] # h5bench: commons/h5bench_util.h:196: multiple definition of `has_vol_async'; # intel-tbb: clang++clang++clang++clang++clang++clang++clang++: : : : : : : clang++error: : unknown argument: '-flifetime-dse=1' + # parallel-netcdf: checking if Fortran "integer*1" is ... configure: error: Could not link conftestf.o and conftest.o # phist: fortran_bindings/test/kernels.F90(63): error #8284: If the actual argument is scalar, the dummy argument shall be scalar unless the actual argument is of type character or is an element of an array that is not assumed shape, pointer, or polymorphic. [ARGV] # pruners-ninja: test/ninja_test_util.c:34: multiple definition of `a'; # py-numpy@1.23.1: numpy/distutils/checks/cpu_avx512_knm.c:22:9: error: implicit declaration of function '_mm512_4fmadd_ps' is invalid in C99 [-Werror,-Wimplicit-function-declaration] # ruby: limits.c:415:34: error: invalid suffix 'D' on floating constant # rust: /usr/bin/ld: /opt/intel/oneapi/compiler/2022.1.0/linux/bin-llvm/../compiler/lib/intel64_lin/libimf.a(libm_feature_flag.o): in function `__libm_feature_flag_init': libm_feature_flag.c:(.text+0x25): undefined reference to `__intel_cpu_feature_indicator_x' + # scr: scr_globals.h:81:10: fatal error: 'spath_mpi.h' file not found: #include "spath_mpi.h" # unifyfs: client/src/unifyfs.c:1502:7: error: unused function 'next_page_align' [-Werror,-Wunused-function] # variorum: ld: Intel/CMakeFiles/variorum_intel.dir/msr_core.c.o:(.bss+0x0): multiple definition of `g_platform'; CMakeFiles/variorum.dir/config_architecture.c.o:(.bss+0x0): first defined here - # vtk-m +openmp: clang++: error: clang frontend command failed with exit code 139 (use -v to see invocation) + # vtk-m: clang++: error: clang frontend command failed with exit code 139 (use -v to see invocation) # GPU BUILD FAILURES #- ginkgo@1.4.0 +oneapi %dpcpp ^cmake%oneapi # ginkgo diff --git a/var/spack/repos/builtin/packages/amrex/package.py b/var/spack/repos/builtin/packages/amrex/package.py index 32578b8b72..3e08fceeeb 100644 --- a/var/spack/repos/builtin/packages/amrex/package.py +++ b/var/spack/repos/builtin/packages/amrex/package.py @@ -14,7 +14,7 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): mesh refinement (AMR) applications.""" homepage = "https://amrex-codes.github.io/amrex/" - url = "https://github.com/AMReX-Codes/amrex/releases/download/22.08/amrex-22.08.tar.gz" + url = "https://github.com/AMReX-Codes/amrex/releases/download/22.07/amrex-22.07.tar.gz" git = "https://github.com/AMReX-Codes/amrex.git" test_requires_compiler = True @@ -24,7 +24,6 @@ class Amrex(CMakePackage, CudaPackage, ROCmPackage): maintainers = ["WeiqunZhang", "asalmgren", "etpalmer63"] version("develop", branch="development") - version("22.08", sha256="d89167c4567fa246b06478a5b160010a0117dc58be9e879beb15be53cb08b6e9") version("22.07", sha256="7df433c780ab8429362df8d6d995c95d87a7c3f31ab81d5b0f416203dece086d") version("22.06", sha256="d8aa58e72c86a3da9a7be5a5947294fd3eaac6b233f563366f9e000d833726db") version("22.05", sha256="a760c7ca12915ca56b60d1f3c44103185db21ec2b8c01bc7b6762ff9c84e3f53") diff --git a/var/spack/repos/builtin/packages/arm-forge/package.py b/var/spack/repos/builtin/packages/arm-forge/package.py index fd26c5d509..b6624aa652 100644 --- a/var/spack/repos/builtin/packages/arm-forge/package.py +++ b/var/spack/repos/builtin/packages/arm-forge/package.py @@ -23,9 +23,6 @@ class ArmForge(Package): if platform.machine() == "aarch64": version( - "22.0.4", sha256="f770781d3c5e2fccb341f6b6ea7ddbe106e26168d4bad4cad3296b2eef65cb76" - ) - version( "22.0.3", sha256="ee460b33a7c94c1dccc400a9b6565d22d1dce76739342c8a768d878777f0f35a" ) version( @@ -57,9 +54,6 @@ class ArmForge(Package): version("21.0", sha256="2bcc745d0049d6b25c77c97b2d7bad7b4f804180972a2306a8599ce41f6a4573") elif platform.machine() == "ppc64le": version( - "22.0.4", sha256="f4cb5bcbaa67f9209299fe4653186a2829760b8b16a2883913aa43766375b04c" - ) - version( "22.0.3", sha256="de2debac40b6cfc61868237d4c04ab929fe26fdeecaee017f948426047fe0f07" ) version( @@ -91,9 +85,6 @@ class ArmForge(Package): version("21.0", sha256="60cfa7dd1cd131ec85e67cb660f2f84cf30bb700d8979cae1f5f88af658fd249") elif platform.machine() == "x86_64": version( - "22.0.4", sha256="a2c8c1da38b9684d7c4656a98b3fc42777b03fd474cd0bf969324804f47587e5" - ) - version( "22.0.3", sha256="4dc8d0bb3923810cf78279dd446d5a529af523271111249b795cef01f86bd0fd" ) version( diff --git a/var/spack/repos/builtin/packages/atmi/0002-Remove-usr-bin-rsync-reference-5.2.0.patch b/var/spack/repos/builtin/packages/atmi/0002-Remove-usr-bin-rsync-reference-5.2.0.patch new file mode 100644 index 0000000000..c2aa362493 --- /dev/null +++ b/var/spack/repos/builtin/packages/atmi/0002-Remove-usr-bin-rsync-reference-5.2.0.patch @@ -0,0 +1,99 @@ +From 5d2011bf498551f41ea99b77c63c33fc37518c00 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran <Renjith.RavindranKannath@amd.com> +Date: Mon, 8 Aug 2022 19:33:10 +0000 +Subject: [PATCH] Reset the installation path and remove direct reference to + /usr/bin/rysnc for rsync command + +--- + src/CMakeLists.txt | 12 ++---------- + src/device_runtime/CMakeLists.txt | 2 +- + src/runtime/core/CMakeLists.txt | 4 ++-- + src/runtime/interop/hsa/CMakeLists.txt | 2 +- + 4 files changed, 6 insertions(+), 14 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index bb563a0..ab04424 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -40,14 +40,6 @@ endif() + + option(FILE_REORG_BACKWARD_COMPATIBILITY "Enable File Reorg with backward compatibility" ON) + #TODO: The string replace statements can be removed once build scripts changes are merged +-if(FILE_REORG_BACKWARD_COMPATIBILITY) +- if(CMAKE_INSTALL_PREFIX) +- string(REPLACE "/atmi" "" CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) +- endif() +- if(CPACK_PACKAGING_INSTALL_PREFIX) +- string(REPLACE "/atmi" "" CPACK_PACKAGING_INSTALL_PREFIX ${CPACK_PACKAGING_INSTALL_PREFIX}) +- endif() +-endif() + ################################################################################ + # Looking for ROCM... + ################################################################################ +@@ -81,7 +73,7 @@ endif() + # make examples available in local build + add_custom_command( + OUTPUT examples +- COMMAND /usr/bin/rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../examples . ++ COMMAND rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../examples . + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../examples/* + ) + add_custom_target(example ALL DEPENDS examples) +@@ -89,7 +81,7 @@ add_custom_target(example ALL DEPENDS examples) + # make bin available in local build + add_custom_command( + OUTPUT bin +- COMMAND /usr/bin/rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../bin . ++ COMMAND rsync -rl ${CMAKE_CURRENT_SOURCE_DIR}/../bin . + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../bin/* + ) + add_custom_target(script ALL DEPENDS bin) +diff --git a/src/device_runtime/CMakeLists.txt b/src/device_runtime/CMakeLists.txt +index 6688af2..6901e01 100644 +--- a/src/device_runtime/CMakeLists.txt ++++ b/src/device_runtime/CMakeLists.txt +@@ -108,7 +108,7 @@ set (OUTPUT_INC_DIRECTORY ${ATMI_RUNTIME_PATH}/include) + execute_process(COMMAND "/bin/mkdir" "-p" "${OUTPUT_INC_DIRECTORY}") + add_custom_command( + OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi_kl.h +- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../include/atmi_kl.h ${OUTPUT_INC_DIRECTORY}/atmi_kl.h ++ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../include/atmi_kl.h ${OUTPUT_INC_DIRECTORY}/atmi_kl.h + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../include/*.h + ) + add_custom_target(device_header ALL DEPENDS ${OUTPUT_INC_DIRECTORY}/atmi_kl.h) +diff --git a/src/runtime/core/CMakeLists.txt b/src/runtime/core/CMakeLists.txt +index 88b3a47..000153a 100644 +--- a/src/runtime/core/CMakeLists.txt ++++ b/src/runtime/core/CMakeLists.txt +@@ -128,13 +128,13 @@ execute_process(COMMAND "/bin/mkdir" "-p" "${OUTPUT_INC_DIRECTORY}") + + add_custom_command( + OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi.h +- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi.h ${OUTPUT_INC_DIRECTORY}/atmi.h ++ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi.h ${OUTPUT_INC_DIRECTORY}/atmi.h + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/*.h + ) + + add_custom_command( + OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi_runtime.h +- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi_runtime.h ${OUTPUT_INC_DIRECTORY}/atmi_runtime.h ++ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/atmi_runtime.h ${OUTPUT_INC_DIRECTORY}/atmi_runtime.h + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../include/*.h + ) + +diff --git a/src/runtime/interop/hsa/CMakeLists.txt b/src/runtime/interop/hsa/CMakeLists.txt +index af1012d..c58b716 100644 +--- a/src/runtime/interop/hsa/CMakeLists.txt ++++ b/src/runtime/interop/hsa/CMakeLists.txt +@@ -22,7 +22,7 @@ execute_process(COMMAND "/bin/mkdir" "-p" "${OUTPUT_INC_DIRECTORY}") + + add_custom_command( + OUTPUT ${OUTPUT_INC_DIRECTORY}/atmi_interop_hsa.h +- COMMAND /usr/bin/rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/atmi_interop_hsa.h ${OUTPUT_INC_DIRECTORY}/atmi_interop_hsa.h ++ COMMAND rsync ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/atmi_interop_hsa.h ${OUTPUT_INC_DIRECTORY}/atmi_interop_hsa.h + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../../../include/*.h + ) + +-- +2.25.1 + diff --git a/var/spack/repos/builtin/packages/atmi/package.py b/var/spack/repos/builtin/packages/atmi/package.py index 7e4c71249f..3fa52448c1 100644 --- a/var/spack/repos/builtin/packages/atmi/package.py +++ b/var/spack/repos/builtin/packages/atmi/package.py @@ -15,11 +15,12 @@ class Atmi(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/atmi" git = "https://github.com/RadeonOpenCompute/atmi.git" - url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/atmi/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="33e77905a607734157d46c736c924c7c50b6b13f2b2ddbf711cb08e37f2efa4f") version("5.1.3", sha256="a43448d77705b2b07e1758ffe8035aa6ba146abc2167984e8cb0f1615797b341") version("5.1.0", sha256="6a758f5a8332e6774cd8e14a4e5ce05e43b1e05298d817b4068c35fa1793d333") version("5.0.2", sha256="3aea040f5a246539ab118f2183cf3e802a21e0e6215a53025eda77f382341747") @@ -104,6 +105,7 @@ class Atmi(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("comgr@" + ver, type="link", when="@" + ver) depends_on("hsa-rocr-dev@" + ver, type="link", when="@" + ver) @@ -112,12 +114,13 @@ class Atmi(CMakePackage): root_cmakelists_dir = "src" patch("0001-Remove-relative-link-paths-to-external-libraries.patch", when="@3.5.0") - patch("0002-Remove-usr-bin-rsync-reference.patch", when="@4.0.0:") + # Removing direct reference to /usr/bin/rysnc for rsync command. + patch("0002-Remove-usr-bin-rsync-reference.patch", when="@4.0.0:5.0.0") + # Reset the installation path and remove direct reference to rsync. + patch("0002-Remove-usr-bin-rsync-reference-5.2.0.patch", when="@5.0.2:") def cmake_args(self): - args = ["-DROCM_VERSION={0}".format(self.spec.version)] - if self.spec.satisfies("@5.0.2:"): - args.append(self.define("FILE_REORG_BACKWARD_COMPATIBILITY", "OFF")) + args = [self.define("ROCM_VERSION", self.spec.version)] return args @run_after("install") diff --git a/var/spack/repos/builtin/packages/comgr/package.py b/var/spack/repos/builtin/packages/comgr/package.py index fb5308c14d..69597af24f 100644 --- a/var/spack/repos/builtin/packages/comgr/package.py +++ b/var/spack/repos/builtin/packages/comgr/package.py @@ -14,14 +14,15 @@ class Comgr(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport" git = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport.git" - url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCm-CompilerSupport/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] libraries = ["libamd_comgr"] version("master", branch="amd-stg-open") + version("5.2.0", sha256="5f63fa93739ee9230756ef93c53019474b6cdddea3b588492d785dae1b08c087") version("5.1.3", sha256="3078c10e9a852fe8357712a263ad775b15944e083f93a879935c877511066ac9") version("5.1.0", sha256="1cdcfe5acb768ef50fb0026d4ee7ba01e615251ad3c27bb2593cdcf8c070a894") version("5.0.2", sha256="20d733f70d8edb573d8c92707f663d7d46dcaff08026cd6addbb83266679f92a") @@ -116,6 +117,7 @@ class Comgr(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: # llvm libs are linked statically, so this *could* be a build dep diff --git a/var/spack/repos/builtin/packages/ginkgo/package.py b/var/spack/repos/builtin/packages/ginkgo/package.py index 490e474dca..aa88add9bc 100644 --- a/var/spack/repos/builtin/packages/ginkgo/package.py +++ b/var/spack/repos/builtin/packages/ginkgo/package.py @@ -147,6 +147,10 @@ class Ginkgo(CMakePackage, CudaPackage, ROCmPackage): if archs != "none": arch_str = ";".join(archs) args.append("-DGINKGO_HIP_AMDGPU={0}".format(arch_str)) + if spec.satisfies("^hip@5.2.0:"): + args.append( + self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip) + ) return args @run_after("install") diff --git a/var/spack/repos/builtin/packages/hip-rocclr/package.py b/var/spack/repos/builtin/packages/hip-rocclr/package.py index 6703ed6392..12f87aa741 100644 --- a/var/spack/repos/builtin/packages/hip-rocclr/package.py +++ b/var/spack/repos/builtin/packages/hip-rocclr/package.py @@ -16,7 +16,7 @@ class HipRocclr(CMakePackage): git = "https://github.com/ROCm-Developer-Tools/ROCclr.git" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] def url_for_version(self, version): # Fix up a typo in the 3.5.0 release. @@ -27,6 +27,7 @@ class HipRocclr(CMakePackage): return url.format(version) version("master", branch="main") + version("5.2.0", sha256="37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb") version("5.1.3", sha256="ddee63cdc6515c90bab89572b13e1627b145916cb8ede075ef8446cbb83f0a48") version("5.1.0", sha256="f4f265604b534795a275af902b2c814f416434d9c9e16db81b3ed5d062187dfa") version("5.0.2", sha256="34decd84652268dde865f38e66f8fb4750a08c2457fea52ad962bced82a03e5e") @@ -113,6 +114,7 @@ class HipRocclr(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) @@ -135,6 +137,7 @@ class HipRocclr(CMakePackage): # Add opencl sources thru the below for d_version, d_shasum in [ + ("5.2.0", "80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0"), ("5.1.3", "44a7fac721abcd93470e1a7e466bdea0c668c253dee93e4f1ea9a72dbce4ba31"), ("5.1.0", "362d81303048cf7ed5d2f69fb65ed65425bc3da4734fff83e3b8fbdda51b0927"), ("5.0.2", "3edb1992ba28b4a7f82dd66fbd121f62bd859c1afb7ceb47fa856bd68feedc95"), @@ -188,8 +191,8 @@ class HipRocclr(CMakePackage): def cmake_args(self): args = [ - "-DUSE_COMGR_LIBRARY=yes", - "-DOPENCL_DIR={0}/opencl-on-vdi".format(self.stage.source_path), + self.define("USE_COMGR_LIBRARY", "yes"), + self.define("OPENCL_DIR", join_path(self.stage.source_path, "opencl-on-vdi")), ] return args diff --git a/var/spack/repos/builtin/packages/hip/0012-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.2.0.patch b/var/spack/repos/builtin/packages/hip/0012-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.2.0.patch new file mode 100644 index 0000000000..3c44a29bbd --- /dev/null +++ b/var/spack/repos/builtin/packages/hip/0012-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host.5.2.0.patch @@ -0,0 +1,78 @@ +From d3d2b2b69ac04ac1d1ead30f546fb4884fb93e27 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran <Renjith.RavindranKannath@amd.com> +Date: Mon, 8 Aug 2022 22:26:13 +0000 +Subject: [PATCH] Improve compilation without git repo and remove compiler rt + linkage for host and correction in CMake target path variable + +--- + bin/hipcc.pl | 3 ++- + hipamd/CMakeLists.txt | 12 +++++++++--- + hipamd/hip-config.cmake.in | 1 - + 3 files changed, 11 insertions(+), 5 deletions(-) + +diff --git a/bin/hipcc.pl b/bin/hipcc.pl +index 1ef3a90..995abe5 100755 +--- a/bin/hipcc.pl ++++ b/bin/hipcc.pl +@@ -605,7 +605,8 @@ if($HIP_PLATFORM eq "amd"){ + $targetsStr = $ENV{HCC_AMDGPU_TARGET}; + } elsif (not $isWindows) { + # Else try using rocm_agent_enumerator +- $ROCM_AGENT_ENUM = "${ROCM_PATH}/bin/rocm_agent_enumerator"; ++ $ROCMINFO_PATH = $ENV{'ROCMINFO_PATH'} // $ROCM_PATH; ++ $ROCM_AGENT_ENUM = "${ROCMINFO_PATH}/bin/rocm_agent_enumerator"; + $targetsStr = `${ROCM_AGENT_ENUM} -t GPU`; + $targetsStr =~ s/\n/,/g; + } +diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt +index 9591924..4f50c2a 100755 +--- a/hipamd/CMakeLists.txt ++++ b/hipamd/CMakeLists.txt +@@ -91,7 +91,13 @@ string(REPLACE "-" ";" VERSION_LIST ${HIP_VERSION_PATCH_GITHASH}) + list(GET VERSION_LIST 0 HIP_VERSION_PATCH) + set(HIP_VERSION_GITDATE 0) + +-find_package(Git) ++if (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/.git") ++ find_package(Git) ++endif() ++set(HIP_VERSION_GITDATE "0") ++set(HIP_VERSION_GITHASH "0") ++set(HIP_VERSION_BUILD_ID 0) ++set(HIP_VERSION_BUILD_NAME "") + + # FIXME: Two different version strings used. + # Below we use UNIX commands, not compatible with Windows. +@@ -183,7 +189,7 @@ set (HIP_LIB_VERSION_MINOR ${HIP_VERSION_MINOR}) + if (${ROCM_PATCH_VERSION} ) + set (HIP_LIB_VERSION_PATCH ${ROCM_PATCH_VERSION}) + else () +- set (HIP_LIB_VERSION_PATCH ${HIP_VERSION_PATCH}-${HIP_VERSION_GITHASH}) ++ set (HIP_LIB_VERSION_PATCH "0") + endif () + set (HIP_LIB_VERSION_STRING "${HIP_LIB_VERSION_MAJOR}.${HIP_LIB_VERSION_MINOR}.${HIP_LIB_VERSION_PATCH}") + if (DEFINED ENV{ROCM_RPATH}) +@@ -395,7 +401,7 @@ if(NOT ${INSTALL_SOURCE} EQUAL 0) + if(WIN32) + install(DIRECTORY ${HIP_COMMON_DIR}/cmake DESTINATION .) + else() +- install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION CONFIG_PACKAGE_INSTALL_DIR) ++ install(DIRECTORY ${HIP_COMMON_DIR}/cmake/ DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR}) + endif() + endif() + +diff --git a/hipamd/hip-config.cmake.in b/hipamd/hip-config.cmake.in +index ba3e75c..02dd586 100755 +--- a/hipamd/hip-config.cmake.in ++++ b/hipamd/hip-config.cmake.in +@@ -290,7 +290,6 @@ if(HIP_COMPILER STREQUAL "clang") + if(CLANGRT_BUILTINS-NOTFOUND) + message(FATAL_ERROR "clangrt builtins lib not found") + else() +- set_property(TARGET hip::host APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") + set_property(TARGET hip::device APPEND PROPERTY INTERFACE_LINK_LIBRARIES "${CLANGRT_BUILTINS}") + endif() + endif() +-- +2.25.1 + diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index c57d4dd8f0..fe0292a4e3 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -18,13 +18,14 @@ class Hip(CMakePackage): homepage = "https://github.com/ROCm-Developer-Tools/HIP" git = "https://github.com/ROCm-Developer-Tools/HIP.git" - url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/HIP/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] libraries = ["libamdhip64"] version("master", branch="master") + version("5.2.0", sha256="a6e0515d4d25865c037b546035df9c51f0882cd2700e759c266ff7e199f37c3a") version("5.1.3", sha256="ce755ee6e407904eba3f6b3c9efcdd48eb4f58a26b06e1892166d05f19a75973") version("5.1.0", sha256="47e542183699f4005c48631d96f6a1fbdf27e07ad3402ccd7b5f707c2c602266") version("5.0.2", sha256="e23601e6f4f62083899ea6356fffbe88d1deb20fa61f2c970e3c0474cd8886ca") @@ -124,6 +125,7 @@ class Hip(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) @@ -142,6 +144,7 @@ class Hip(CMakePackage): # Add hip-amd sources thru the below for d_version, d_shasum in [ + ("5.2.0", "8774958bebc29a4b7eb9dc2d38808d79d9a24bf9c1f44e801ff99d2d5ba82240"), ("5.1.3", "707f2217f0e7aeb62d7b76830a271056d665542bf5f7a54e40adf4d5f299ca93"), ("5.1.0", "77984854bfe00f938353fe4c7604d09967eaf5c609d05f1e6423d3c3dea86e61"), ("5.0.2", "80e7268dd22eba0f2f9222932480dede1d80e56227c0168c6a0cc8e4f23d3b76"), @@ -162,6 +165,7 @@ class Hip(CMakePackage): ) # Add opencl sources thru the below for d_version, d_shasum in [ + ("5.2.0", "80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0"), ("5.1.3", "44a7fac721abcd93470e1a7e466bdea0c668c253dee93e4f1ea9a72dbce4ba31"), ("5.1.0", "362d81303048cf7ed5d2f69fb65ed65425bc3da4734fff83e3b8fbdda51b0927"), ("5.0.2", "3edb1992ba28b4a7f82dd66fbd121f62bd859c1afb7ceb47fa856bd68feedc95"), @@ -181,6 +185,7 @@ class Hip(CMakePackage): when="@{0}".format(d_version), ) for d_version, d_shasum in [ + ("5.2.0", "37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb"), ("5.1.3", "ddee63cdc6515c90bab89572b13e1627b145916cb8ede075ef8446cbb83f0a48"), ("5.1.0", "f4f265604b534795a275af902b2c814f416434d9c9e16db81b3ed5d062187dfa"), ("5.0.2", "34decd84652268dde865f38e66f8fb4750a08c2457fea52ad962bced82a03e5e"), @@ -214,7 +219,16 @@ class Hip(CMakePackage): patch( "0011-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host" ".5.0.2.patch", - when="@5.0.2:", + when="@5.0.2:5.1.3", + ) + + # Improve compilation without git repo and remove compiler rt linkage + # for host and correction in CMake target path variable and + # correcting the CMake path variable. + patch( + "0012-Improve-compilation-without-git-repo-and-remove-compiler-rt-linkage-for-host" + ".5.2.0.patch", + when="@5.2.0:", ) # See https://github.com/ROCm-Developer-Tools/HIP/pull/2141 diff --git a/var/spack/repos/builtin/packages/hipblas/package.py b/var/spack/repos/builtin/packages/hipblas/package.py index b87f3b06d9..d1cf39bff7 100644 --- a/var/spack/repos/builtin/packages/hipblas/package.py +++ b/var/spack/repos/builtin/packages/hipblas/package.py @@ -14,14 +14,15 @@ class Hipblas(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipBLAS" git = "https://github.com/ROCmSoftwarePlatform/hipBLAS.git" - url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["cgmb", "srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"] libraries = ["libhipblas"] version("develop", branch="develop") version("master", branch="master") + version("5.2.0", sha256="5e9091dc4ef83896f5c3bc5ade1cb5db8e1a6afc451dbba4da19d8a7ec2b6f29") version("5.1.3", sha256="f0fdaa851971b41b48ec2e7d640746fbd6f9f433da2020c5fd95c91a7473d9e1") version("5.1.0", sha256="22faba3828e50a4c4e22f569a7d6441c797a11db1d472619c01d3515a3275e92") version("5.0.2", sha256="201772bfc422ecb2c50e898dccd7d3d376cf34a2b795360e34bf71326aa37646") @@ -126,6 +127,7 @@ class Hipblas(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocsolver@" + ver, when="@" + ver) @@ -145,7 +147,6 @@ class Hipblas(CMakePackage): def cmake_args(self): args = [ # Make sure find_package(HIP) finds the module. - self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake), self.define("BUILD_CLIENTS_SAMPLES", "OFF"), self.define("BUILD_CLIENTS_TESTS", self.run_tests), ] @@ -159,9 +160,10 @@ class Hipblas(CMakePackage): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) - - if self.spec.satisfies("@5.2.0:"): - args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", "ON")) + if self.spec.satisfies("@:5.1"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake)) + elif self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/hipcub/package.py b/var/spack/repos/builtin/packages/hipcub/package.py index 980af3972e..8aa066bc3e 100644 --- a/var/spack/repos/builtin/packages/hipcub/package.py +++ b/var/spack/repos/builtin/packages/hipcub/package.py @@ -11,11 +11,12 @@ class Hipcub(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipCUB" git = "https://github.com/ROCmSoftwarePlatform/hipCUB.git" - url = "https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="ac4dc2310f0eb657e1337c93d8cc4a5d8396f9544a7336eeceb455678a1f9139") version("5.1.3", sha256="dc75640689b6a5e15dd3acea643266bdf114ea63efc60be8272f484cf8f04494") version("5.1.0", sha256="b30d51fc5fca2584f0c9a6fa8dafc9fbdda96a3acff30288e49b397f8842f705") version("5.0.2", sha256="22effb18f2c38d76fa379f14c9f9ee7a11987a5d1ae4a7e837af87232c8c9183") @@ -101,6 +102,7 @@ class Hipcub(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) @@ -110,9 +112,13 @@ class Hipcub(CMakePackage): env.set("CXX", self.spec["hip"].hipcc) def cmake_args(self): - args = [self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake)] + args = [] if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@:5.1"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake)) + if self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/hipfft/package.py b/var/spack/repos/builtin/packages/hipfft/package.py index 8fc20c0233..b3ac42a438 100644 --- a/var/spack/repos/builtin/packages/hipfft/package.py +++ b/var/spack/repos/builtin/packages/hipfft/package.py @@ -16,13 +16,13 @@ class Hipfft(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipFFT" git = "https://github.com/ROCmSoftwarePlatform/hipFFT.git" - url = "https://github.com/ROCmSoftwarePlatform/hipfft/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipfft/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["arjun-raj-kuppala", "srekolam"] + maintainers = ["renjithravindrankannath", "srekolam"] version("master", branch="master") - + version("5.2.0", sha256="ec37edcd61837281c403802ccc1cb01ec3fa3ba135b5ab16617961b66d4cc3e2") version("5.1.3", sha256="c26fa64499293b25d0686bed04feb61378c878a4bb4a6d559e6cb7be1f6bf2ec") version("5.1.0", sha256="1bac7761c055355216cd262cdc0450aabb383addcb739b56ba849b2e6e013fa5") version("5.0.2", sha256="9ef64694f5def0d6fb98dc89e46d7a3f7d005a61348ac0b52184a3b8e84c2383") @@ -70,6 +70,7 @@ class Hipfft(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -81,11 +82,16 @@ class Hipfft(CMakePackage): def cmake_args(self): args = [ # Make sure find_package(HIP) finds the module. - self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake), self.define("BUILD_CLIENTS_SAMPLES", "OFF"), ] if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@3.7.0:5.1"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake)) + elif self.spec.satisfies("@5.2.0:"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) + return args diff --git a/var/spack/repos/builtin/packages/hipfort/package.py b/var/spack/repos/builtin/packages/hipfort/package.py index e2ecd6ba02..cac817d371 100644 --- a/var/spack/repos/builtin/packages/hipfort/package.py +++ b/var/spack/repos/builtin/packages/hipfort/package.py @@ -11,11 +11,12 @@ class Hipfort(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipfort" git = "https://github.com/ROCmSoftwarePlatform/hipfort.git" - url = "https://github.com/ROCmSoftwarePlatform/hipfort/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipfort/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="a0af1fe62757993600a41af6bb6c4b8c6cfdfba650389645ac1f995f7623785c") version("5.1.3", sha256="8f8849d8d0972366bafa41be35cf6a7a59480ed584d1ddff39768cb14247e9d4") version("5.1.0", sha256="1ddd46c00bb6bcd539a921d6a94d858f4e4408a35cb6910186c7517f375ae8ab") version("5.0.2", sha256="fcee6e62482ab15f365681dbc12bd9ae26b0fab2f2848a3c14de8ec63004a7aa") @@ -89,6 +90,7 @@ class Hipfort(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/hipsolver/package.py b/var/spack/repos/builtin/packages/hipsolver/package.py index 3c0570b93a..6f81b1bea7 100644 --- a/var/spack/repos/builtin/packages/hipsolver/package.py +++ b/var/spack/repos/builtin/packages/hipsolver/package.py @@ -18,14 +18,15 @@ class Hipsolver(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipSOLVER" git = "https://github.com/ROCmSoftwarePlatform/hipSOLVER.git" - url = "https://github.com/ROCmSoftwarePlatform/hipSOLVER/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipSOLVER/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["cgmb", "srekolam"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] libraries = ["libhipsolver"] version("develop", branch="develop") version("master", branch="master") + version("5.2.0", sha256="96927410e0a2cc0f50172604ef6437e15d2cf4b62d22b2035f13aae21f43dc82") version("5.1.3", sha256="96faa799a2db8078b72f9c3b5c199179875a7c20dc1064371b22a6a63397c145") version("5.1.0", sha256="697ba2b2814e7ac6f79680e6455b4b5e0def1bee2014b6940f47be7d13c0ae74") version("5.0.2", sha256="cabeada451686ed7904a452c5f8fd3776721507db1c06f426cd8d7189ff4a441") @@ -50,7 +51,7 @@ class Hipsolver(CMakePackage): depends_on("rocblas@" + ver, when="@" + ver) depends_on("rocsolver@" + ver, when="@" + ver) - for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3"]: + for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0"]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocblas@" + ver, when="@" + ver) depends_on("rocsolver@" + ver, when="@" + ver) @@ -83,6 +84,6 @@ class Hipsolver(CMakePackage): ] if self.spec.satisfies("@5.2.0:"): - args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", "ON")) + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/hipsparse/package.py b/var/spack/repos/builtin/packages/hipsparse/package.py index 2378ca41e6..3b25234a70 100644 --- a/var/spack/repos/builtin/packages/hipsparse/package.py +++ b/var/spack/repos/builtin/packages/hipsparse/package.py @@ -14,12 +14,13 @@ class Hipsparse(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/hipSPARSE" git = "https://github.com/ROCmSoftwarePlatform/hipSPARSE.git" - url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"] libraries = ["libhipsparse"] + version("5.2.0", sha256="4fdab6ec953c6d2d000687c5979077deafd37208cd722554b5a6ede1e5ba170c") version("5.1.3", sha256="6e6a0752654f0d391533df8cedf4b630a78ad34c99087741520c582963ce1602") version("5.1.0", sha256="f41329534f2ff477a0db6b7f77a72bb062f117800970c122d676db8b207ce80b") version("5.0.2", sha256="a266e8b3bbdea04617260f51b3d85cc672af6ca417cae0812d04fd9702429c47") @@ -104,6 +105,7 @@ class Hipsparse(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -123,6 +125,7 @@ class Hipsparse(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocprim@" + ver, when="@" + ver) @@ -143,7 +146,6 @@ class Hipsparse(CMakePackage): def cmake_args(self): args = [ # Make sure find_package(HIP) finds the module. - self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake), self.define("CMAKE_CXX_STANDARD", "14"), self.define("BUILD_CLIENTS_SAMPLES", "OFF"), self.define("BUILD_CLIENTS_TESTS", "OFF"), @@ -152,6 +154,10 @@ class Hipsparse(CMakePackage): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@:5.1"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake)) + elif self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py index c8302a166c..23a71e25ae 100644 --- a/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py +++ b/var/spack/repos/builtin/packages/hsa-rocr-dev/package.py @@ -17,13 +17,14 @@ class HsaRocrDev(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/ROCR-Runtime" git = "https://github.com/RadeonOpenCompute/ROCR-Runtime.git" - url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCR-Runtime/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] libraries = ["libhsa-runtime64"] version("master", branch="master") + version("5.2.0", sha256="529e49693dd9f6459586dd0a26f14dd77dbdf8c0b45fb54830b294eba7babd27") version("5.1.3", sha256="479340ec34cdffbbdb1002c85a47d1fccd23e8394631a1f001ef6130be08287d") version("5.1.0", sha256="a5f7245059c3d28dbc037e1e6fa3f09084e29147096dd61f7ce5560291ab330f") version("5.0.2", sha256="94ce313f3b37e6571778dc6865d73dafa798cbaf4de63b5307382c4a2418e99f") @@ -114,6 +115,7 @@ class HsaRocrDev(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) @@ -154,11 +156,11 @@ class HsaRocrDev(CMakePackage): self.define_from_variant("BUILD_SHARED_LIBS", "shared"), ] - if "@3.7.0:" in spec: + if self.spec.satisfies("@3.7.0:"): args.append(self.define_from_variant("IMAGE_SUPPORT", "image")) # device libs is bundled with llvm-amdgpu (default) or standalone - if "^rocm-device-libs" in spec: + if self.spec.satisfies("^rocm-device-libs"): bitcode_dir = spec["rocm-device-libs"].prefix.amdgcn.bitcode else: bitcode_dir = spec["llvm-amdgpu"].prefix.amdgcn.bitcode diff --git a/var/spack/repos/builtin/packages/hsakmt-roct/package.py b/var/spack/repos/builtin/packages/hsakmt-roct/package.py index 55cbcf2d43..45a6310255 100644 --- a/var/spack/repos/builtin/packages/hsakmt-roct/package.py +++ b/var/spack/repos/builtin/packages/hsakmt-roct/package.py @@ -14,12 +14,13 @@ class HsakmtRoct(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface" git = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface.git" - url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.0.2.tar.gz" + url = "https://github.com/RadeonOpenCompute/ROCT-Thunk-Interface/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "arjun-raj-kuppala", "renjithravindrankannath"] version("master", branch="master") + version("5.2.0", sha256="3797cb0eafbec3fd3d4a2b53f789eb8cdbab30729f13dbcca0a10bc1bafd2187") version("5.1.3", sha256="3c66b1aa7451571ce8bee10e601d34b93c9416b9be476610ee5685dbad81034a") version("5.1.0", sha256="032717e80b1aefed59f11399e575564ee86ee7c125e889f7c79c2afdfab1eb93") version("5.0.2", sha256="f2a27ac18aada1dc0dba6455beb7dd7d88a4457c1917024ea372fecb03356e97") diff --git a/var/spack/repos/builtin/packages/kokkos/package.py b/var/spack/repos/builtin/packages/kokkos/package.py index d5f89621f6..f05fb1845d 100644 --- a/var/spack/repos/builtin/packages/kokkos/package.py +++ b/var/spack/repos/builtin/packages/kokkos/package.py @@ -265,7 +265,7 @@ class Kokkos(CMakePackage, CudaPackage, ROCmPackage): options = [ from_variant("CMAKE_POSITION_INDEPENDENT_CODE", "pic"), - from_variant("CMAKE_CXX_STANDARD", "std"), + from_variant("Kokkos_CXX_STANDARD", "std"), from_variant("BUILD_SHARED_LIBS", "shared"), ] diff --git a/var/spack/repos/builtin/packages/lerc/package.py b/var/spack/repos/builtin/packages/lerc/package.py index 89e92147dc..92b788dd28 100644 --- a/var/spack/repos/builtin/packages/lerc/package.py +++ b/var/spack/repos/builtin/packages/lerc/package.py @@ -20,7 +20,3 @@ class Lerc(CMakePackage): version("3.0", sha256="8c0148f5c22d823eff7b2c999b0781f8095e49a7d3195f13c68c5541dd5740a1") depends_on("cmake@3.11:", type="build") - - @property - def libs(self): - return find_libraries(["libLerc"], root=self.prefix, recursive=True) diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/adjust-openmp-bitcode-directory-for-llvm-link.patch b/var/spack/repos/builtin/packages/llvm-amdgpu/adjust-openmp-bitcode-directory-for-llvm-link.patch new file mode 100644 index 0000000000..ca5e29457e --- /dev/null +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/adjust-openmp-bitcode-directory-for-llvm-link.patch @@ -0,0 +1,27 @@ +From 0aecf225347bea7153b848261da51b2b97cc86b6 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran <Renjith.RavindranKannath@amd.com> +Date: Mon, 8 Aug 2022 21:44:11 +0000 +Subject: [PATCH] Adjust openmp bitcode directory for llvm link as llvm 5.2 + have a change where the OpenMP clang toolchain looks for bitcode files in + llvm/bin/../lib instead of llvm/bin/../libdevice + +--- + clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp +index 9115fcf61..ce044712d 100644 +--- a/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp ++++ b/clang/lib/Driver/ToolChains/AMDGPUOpenMP.cpp +@@ -179,7 +179,7 @@ const char *AMDGCN::OpenMPLinker::constructLLVMLinkCommand( + getProcessorFromTargetID(getToolChain().getTriple(), TargetID); + + // If device debugging turned on, add specially built bc files +- StringRef libpath = Args.MakeArgString(C.getDriver().Dir + "/../lib"); ++ StringRef libpath = Args.MakeArgString(C.getDriver().Dir + "/../lib/libdevice"); + std::string lib_debug_path = FindDebugInLibraryPath(); + if (!lib_debug_path.empty()) + libpath = lib_debug_path; +-- +2.25.1 + diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 3704770dd7..13cbcb18c5 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -15,12 +15,13 @@ class LlvmAmdgpu(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/llvm-project" git = "https://github.com/RadeonOpenCompute/llvm-project.git" - url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/llvm-project/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] version("master", branch="amd-stg-open") + version("5.2.0", sha256="0f892174111b78a02d1a00f8f46d9f80b9abb95513a7af38ecf2a5a0882fe87f") version("5.1.3", sha256="d236a2064363c0278f7ba1bb2ff1545ee4c52278c50640e8bb2b9cfef8a2f128") version("5.1.0", sha256="db5d45c4a7842a908527c1b7b8d4a40c688225a41d23cfa382eab23edfffdd10") version("5.0.2", sha256="99a14394b406263576ed3d8d10334de7c78d42b349109f375d178b11492eecaf") @@ -130,6 +131,12 @@ class LlvmAmdgpu(CMakePackage): patch("fix-spack-detection-4.2.0.patch", when="@4.2.0:4.5.2") patch("remove-cyclades-inclusion-in-sanitizer.patch", when="@4.2.0:4.5.2") + + # OpenMP clang toolchain looks for bitcode files in llvm/bin/../lib + # as per 5.2.0 llvm code. It used to be llvm/bin/../lib/libdevice. + # Below patch is to look in the old path. + patch("adjust-openmp-bitcode-directory-for-llvm-link.patch", when="@5.2.0:") + conflicts("^cmake@3.19.0") root_cmakelists_dir = "llvm" @@ -137,6 +144,7 @@ class LlvmAmdgpu(CMakePackage): # Add device libs sources so they can be an external LLVM project for d_version, d_shasum in [ + ("5.2.0", "901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c"), ("5.1.3", "c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e"), ("5.1.0", "47dbcb41fb4739219cadc9f2b5f21358ed2f9895ce786d2f7a1b2c4fd044d30f"), ("5.0.2", "49cfa8f8fc276ba27feef40546788a2aabe259a924a97af8bef24e295d19aa5e"), diff --git a/var/spack/repos/builtin/packages/migraphx/0003-restrict-python-2.7-usage.patch b/var/spack/repos/builtin/packages/migraphx/0003-restrict-python-2.7-usage.patch new file mode 100644 index 0000000000..59dbb6eadf --- /dev/null +++ b/var/spack/repos/builtin/packages/migraphx/0003-restrict-python-2.7-usage.patch @@ -0,0 +1,25 @@ +From ceba794da2c056817f34b8fe73f17423ffb670e6 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran <Renjith.RavindranKannath@amd.com> +Date: Mon, 8 Aug 2022 22:02:19 +0000 +Subject: [PATCH] Restrict python 2.7 usage for Spack + +--- + cmake/PythonModules.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/PythonModules.cmake b/cmake/PythonModules.cmake +index 2a64801..95aa02a 100755 +--- a/cmake/PythonModules.cmake ++++ b/cmake/PythonModules.cmake +@@ -53,7 +53,7 @@ function(py_add_module NAME) + ) + + endfunction() +-set(PYTHON_SEARCH_VERSIONS 2.7 3.5 3.6 3.7 3.8 3.9) ++set(PYTHON_SEARCH_VERSIONS 3.5 3.6 3.7 3.8 3.9) + set(PYTHON_DISABLE_VERSIONS "" CACHE STRING "") + foreach(PYTHON_DISABLE_VERSION ${PYTHON_DISABLE_VERSIONS}) + list(REMOVE_ITEM PYTHON_SEARCH_VERSIONS ${PYTHON_DISABLE_VERSION}) +-- +2.25.1 + diff --git a/var/spack/repos/builtin/packages/migraphx/package.py b/var/spack/repos/builtin/packages/migraphx/package.py index 45d75f0493..9da2a56107 100644 --- a/var/spack/repos/builtin/packages/migraphx/package.py +++ b/var/spack/repos/builtin/packages/migraphx/package.py @@ -13,12 +13,13 @@ class Migraphx(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX" git = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX.git" - url = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/AMDMIGraphX/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["libmigraphx"] + version("5.2.0", sha256="33afcdf52c6e0e3a2f939fcf30e87f712b8e8ef3633a3dc03a19fea359704925") version("5.1.3", sha256="686e068774500a46b6e6488370bbf5bd0bba6d19ecdb00636f951704d19c9ef2") version("5.1.0", sha256="6398efaef18a74f2a475aa21bd34bc7c077332a430ee3f6ba4fde6e6a6aa9f89") version("5.0.2", sha256="3ef48ac03b909d1a1aa1f91f365ce64af2ce66635b6efb5ad0b207dc51ff2fd6") @@ -93,7 +94,10 @@ class Migraphx(CMakePackage): ) patch("0001-Adding-nlohmann-json-include-directory.patch", when="@3.9.0:") - patch("0002-restrict-python-2.7-usage.patch", when="@3.9.0:") + # Restrict Python 2.7 usage to fix the issue below + # https://github.com/spack/spack/issues/24429 + patch("0002-restrict-python-2.7-usage.patch", when="@3.9.0:5.1.3") + patch("0003-restrict-python-2.7-usage.patch", when="@5.2.0:") depends_on("cmake@3.5:", type="build") depends_on("protobuf", type="link") @@ -122,6 +126,7 @@ class Migraphx(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/miopen-hip/package.py b/var/spack/repos/builtin/packages/miopen-hip/package.py index 75577790c5..83880e3eae 100644 --- a/var/spack/repos/builtin/packages/miopen-hip/package.py +++ b/var/spack/repos/builtin/packages/miopen-hip/package.py @@ -14,12 +14,13 @@ class MiopenHip(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen" git = "https://github.com/ROCmSoftwarePlatform/MIOpen.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["libMIOpen"] + version("5.2.0", sha256="5fda69426e81df9f8fb6658e579176b9c4fcce3516fc8488d3cfd2b6f6f2b3b4") version("5.1.3", sha256="510461f5c5bdbcf8dc889099d1e5960b9f84bd845a9fc9154588a9898c701c1d") version("5.1.0", sha256="bb50201334d68addf153b84b88ab803027c4913d71bdbda6f5ccde3f672f6fdd") version("5.0.2", sha256="e73c18c6e0791d6ca8958508d899072ce12fc6c27cf78792d0c2a5c7e34427be") @@ -116,13 +117,14 @@ class MiopenHip(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) depends_on("rocm-clang-ocl@" + ver, when="@" + ver) depends_on("rocblas@" + ver, when="@" + ver) - for ver in ["5.1.0", "5.1.3"]: + for ver in ["5.1.0", "5.1.3", "5.2.0"]: depends_on("mlirmiopen@" + ver, when="@" + ver) def setup_build_environment(self, env): diff --git a/var/spack/repos/builtin/packages/miopen-opencl/package.py b/var/spack/repos/builtin/packages/miopen-opencl/package.py index 1e38f29868..c31488b031 100644 --- a/var/spack/repos/builtin/packages/miopen-opencl/package.py +++ b/var/spack/repos/builtin/packages/miopen-opencl/package.py @@ -14,12 +14,13 @@ class MiopenOpencl(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/MIOpen" git = "https://github.com/ROCmSoftwarePlatform/MIOpen.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["libMIOpen"] + version("5.2.0", sha256="5fda69426e81df9f8fb6658e579176b9c4fcce3516fc8488d3cfd2b6f6f2b3b4") version("5.1.3", sha256="510461f5c5bdbcf8dc889099d1e5960b9f84bd845a9fc9154588a9898c701c1d") version("5.1.0", sha256="bb50201334d68addf153b84b88ab803027c4913d71bdbda6f5ccde3f672f6fdd") version("5.0.2", sha256="e73c18c6e0791d6ca8958508d899072ce12fc6c27cf78792d0c2a5c7e34427be") @@ -114,6 +115,7 @@ class MiopenOpencl(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -135,10 +137,11 @@ class MiopenOpencl(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("miopengemm@" + ver, when="@" + ver) - for ver in ["5.1.0", "5.1.3"]: + for ver in ["5.1.0", "5.1.3", "5.2.0"]: depends_on("mlirmiopen@" + ver, when="@" + ver) @classmethod diff --git a/var/spack/repos/builtin/packages/miopengemm/package.py b/var/spack/repos/builtin/packages/miopengemm/package.py index 77a39ae144..f7633ed7ef 100644 --- a/var/spack/repos/builtin/packages/miopengemm/package.py +++ b/var/spack/repos/builtin/packages/miopengemm/package.py @@ -14,10 +14,10 @@ class Miopengemm(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM" git = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM.git" - url = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "arjun-raj-kuppala", "renjithravindrankannath"] libraries = ["libmiopengemm"] def url_for_version(self, version): @@ -26,6 +26,7 @@ class Miopengemm(CMakePackage): url = "https://github.com/ROCmSoftwarePlatform/MIOpenGEMM/archive/rocm-{0}.tar.gz" return url.format(version) + version("5.2.0", sha256="10458fb07b56a7fbe165595d588b7bf5f1300c57bda2f3133c3687c7bae39ea8") version("5.1.3", sha256="c70fc9e2a6d47356a612e24f5757bf16fdf26e671bd53a0975c1a0978da740b6") version("5.1.0", sha256="e2b20cdc20a745bcb7a554852e6b4bd39274c7dcc13fc19a81a282fb4dfa475f") version("5.0.2", sha256="64a6bf7c902af63d85563e29361763e9daa1fd3699490a91c222b057673612cc") @@ -110,6 +111,7 @@ class Miopengemm(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@" + ver, type="build", when="@" + ver) depends_on("rocm-opencl@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/mivisionx/package.py b/var/spack/repos/builtin/packages/mivisionx/package.py index efbfd8e0a1..430fbf7306 100644 --- a/var/spack/repos/builtin/packages/mivisionx/package.py +++ b/var/spack/repos/builtin/packages/mivisionx/package.py @@ -13,9 +13,10 @@ class Mivisionx(CMakePackage): homepage = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX" git = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX.git" - url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-5.2.0.tar.gz" - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + tags = ["rocm"] def url_for_version(self, version): if version == Version("1.7"): @@ -24,6 +25,7 @@ class Mivisionx(CMakePackage): url = "https://github.com/GPUOpen-ProfessionalCompute-Libraries/MIVisionX/archive/rocm-{0}.tar.gz" return url.format(version) + version("5.2.0", sha256="fee620a1edd3bce18b2cec9ef26ec2afe0a85d6da8a37ed713ab0d1342382503") version("5.1.3", sha256="62591d5caedc13832c3ccef629a88d9c2a43c884daad1124ddcb9c5f7d5470e9") version("5.1.0", sha256="e082415cc2fb859c53a6d6e5d72ca4529f6b4d56a4abe274dc374faaa5910513") version("5.0.2", sha256="da730c2347b7f2d0cb7a262f8305750988f18e9f1eb206cf297bacaab2f6b408") @@ -103,7 +105,7 @@ class Mivisionx(CMakePackage): "utilities/mv_deploy/CMakeLists.txt", string=True, ) - if "@4.5.0:" in self.spec: + if "@4.5.0:5.1" in self.spec: filter_file( "${ROCM_PATH}/miopen", self.spec["miopen-hip"].prefix.miopen, @@ -162,11 +164,12 @@ class Mivisionx(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-opencl@" + ver, when="@" + ver) depends_on("miopengemm@" + ver, when="@" + ver) depends_on("miopen-opencl@" + ver, when="@" + ver) - for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3"]: + for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0"]: depends_on("miopen-hip@" + ver, when="@" + ver) def cmake_args(self): diff --git a/var/spack/repos/builtin/packages/mlirmiopen/package.py b/var/spack/repos/builtin/packages/mlirmiopen/package.py index 3539ce4dbb..f76579cf89 100644 --- a/var/spack/repos/builtin/packages/mlirmiopen/package.py +++ b/var/spack/repos/builtin/packages/mlirmiopen/package.py @@ -11,12 +11,13 @@ class Mlirmiopen(CMakePackage): """Multi-Level Intermediate Representation for rocm miopen project.""" homepage = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir" - url = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir/archive/refs/tags/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir/archive/refs/tags/rocm-5.2.0.tar.gz" git = "https://github.com/ROCmSoftwarePlatform/llvm-project-mlir.git" tags = ["rocm"] maintainers = ["srekolam"] + version("5.2.0", sha256="546121f203e7787d3501fbaf6673bdbeefbb39e0446b02c480454338362a1f01") version("5.1.3", sha256="936f92707ffe9a1973728503db6365bb7f14e5aeccfaef9f0924e54d25080c69") version("5.1.0", sha256="56dab11877295784cbb754c10bf2bd6535a3dfea31ec0b97ffe77b94115109dc") @@ -36,7 +37,7 @@ class Mlirmiopen(CMakePackage): depends_on("half") depends_on("pkgconfig", type="build") - for ver in ["5.1.0", "5.1.3"]: + for ver in ["5.1.0", "5.1.3", "5.2.0"]: depends_on("hip@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/mxnet/package.py b/var/spack/repos/builtin/packages/mxnet/package.py index 009cebdebc..90d5db3197 100644 --- a/var/spack/repos/builtin/packages/mxnet/package.py +++ b/var/spack/repos/builtin/packages/mxnet/package.py @@ -64,11 +64,7 @@ class Mxnet(CMakePackage, CudaPackage): version("master", branch="master", submodules=True) version("1.master", branch="v1.x", submodules=True) - version( - "1.8.0", - sha256="95aff985895aba409c08d5514510ae38b88490cfb6281ab3a5ff0f5826c8db54", - preferred=True, - ) + version("1.8.0", sha256="95aff985895aba409c08d5514510ae38b88490cfb6281ab3a5ff0f5826c8db54") version("1.7.0", sha256="1d20c9be7d16ccb4e830e9ee3406796efaf96b0d93414d676337b64bc59ced18") version("1.6.0", sha256="01eb06069c90f33469c7354946261b0a94824bbaf819fd5d5a7318e8ee596def") version( diff --git a/var/spack/repos/builtin/packages/rccl/package.py b/var/spack/repos/builtin/packages/rccl/package.py index cc2d727d0f..c9f3ae39f2 100644 --- a/var/spack/repos/builtin/packages/rccl/package.py +++ b/var/spack/repos/builtin/packages/rccl/package.py @@ -16,12 +16,13 @@ class Rccl(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rccl" git = "https://github.com/ROCmSoftwarePlatform/rccl.git" - url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librccl"] + version("5.2.0", sha256="6ee3a04da0d16eb53f768a088633a7d8ecc4416a2d0c07f7ba8426ab7892b060") version("5.1.3", sha256="56491257f27b48bf85f4b91434a2a6e49a448337c889db181b02c8a4a260a4bc") version("5.1.0", sha256="02b0180857e615326f9cab775573436b9162899ad8e526830f54392b8a51b1f5") version("5.0.2", sha256="a2377ad2332b93d3443a8ee74f4dd9f965ae8cbbfad473f8f57ca17905389a39") @@ -110,6 +111,7 @@ class Rccl(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -132,9 +134,10 @@ class Rccl(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("numactl@2:", when="@" + ver) - for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3"]: + for ver in ["4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0"]: depends_on("rocm-smi-lib@" + ver, when="@" + ver) @classmethod diff --git a/var/spack/repos/builtin/packages/rdc/package.py b/var/spack/repos/builtin/packages/rdc/package.py index c43ad16019..03c1e206a1 100644 --- a/var/spack/repos/builtin/packages/rdc/package.py +++ b/var/spack/repos/builtin/packages/rdc/package.py @@ -14,7 +14,7 @@ class Rdc(CMakePackage): url = "https://github.com/RadeonOpenCompute/rdc/archive/rocm-4.3.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librdc"] def url_for_version(self, version): @@ -24,6 +24,7 @@ class Rdc(CMakePackage): url = "https://github.com/RadeonOpenCompute/rdc/archive/rocm-{0}.tar.gz" return url.format(version) + version("5.2.0", sha256="2f35f74485e783f56ea724a7c69ce825f181fcdbe89de453d97ce6a3d3176ae0") version("5.1.3", sha256="ac3e594d7b245c787d6d9b63f551ca898d4d9403fbec0e4502f9970575e031b8") version("5.1.0", sha256="3cf58cb07ef241b3b73b23af83b6477194884feba642584a491e67deeceff038") version("5.0.2", sha256="9e21fe7e9dd02b69425dab6be22a85469fee072bcebd2d2957633dfad8b45574") @@ -99,10 +100,11 @@ class Rdc(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-smi-lib@" + ver, type=("build", "link"), when="@" + ver) - for ver in ["5.0.0", "5.0.2", "5.1.0", "5.1.3"]: + for ver in ["5.0.0", "5.0.2", "5.1.0", "5.1.3", "5.2.0"]: depends_on("hsa-rocr-dev@" + ver, when="@" + ver) def patch(self): diff --git a/var/spack/repos/builtin/packages/rocalution/0003-fix-compilation-for-rocalution-5.2.0.patch b/var/spack/repos/builtin/packages/rocalution/0003-fix-compilation-for-rocalution-5.2.0.patch new file mode 100644 index 0000000000..7090e92e1c --- /dev/null +++ b/var/spack/repos/builtin/packages/rocalution/0003-fix-compilation-for-rocalution-5.2.0.patch @@ -0,0 +1,35 @@ +From 58046aee2ab5d53092811e77ae9b17a226aadf90 Mon Sep 17 00:00:00 2001 +From: Renjith Ravindran <Renjith.RavindranKannath@amd.com> +Date: Mon, 8 Aug 2022 22:52:43 +0000 +Subject: [PATCH] Fix for compilation failure in rocalution 5.2.0 + +--- + src/solvers/multigrid/ruge_stueben_amg.hpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/solvers/multigrid/ruge_stueben_amg.hpp b/src/solvers/multigrid/ruge_stueben_amg.hpp +index 24ee942..7f25796 100644 +--- a/src/solvers/multigrid/ruge_stueben_amg.hpp ++++ b/src/solvers/multigrid/ruge_stueben_amg.hpp +@@ -58,14 +58,16 @@ namespace rocalution + ROCALUTION_EXPORT + virtual void Print(void) const; + ++#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) + /** \brief Set coupling strength */ + ROCALUTION_EXPORT +-#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) ++ void SetCouplingStrength(ValueType eps); + #else + [[deprecated("This function will be removed in a future release. Use " + "SetStrengthThreshold() instead")]] +-#endif ++ ROCALUTION_EXPORT + void SetCouplingStrength(ValueType eps); ++#endif + + /** \brief Set strength threshold */ + ROCALUTION_EXPORT +-- +2.25.1 + diff --git a/var/spack/repos/builtin/packages/rocalution/package.py b/var/spack/repos/builtin/packages/rocalution/package.py index b15feb0a52..95cd325822 100644 --- a/var/spack/repos/builtin/packages/rocalution/package.py +++ b/var/spack/repos/builtin/packages/rocalution/package.py @@ -18,12 +18,13 @@ class Rocalution(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocALUTION" git = "https://github.com/ROCmSoftwarePlatform/rocALUTION.git" - url = "https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocALUTION/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] libraries = ["librocalution_hip"] + version("5.2.0", sha256="a5aac471bbec87d019ad7c6db779c73327ad40ecdea09dc5ab2106e62cd6b7eb") version("5.1.3", sha256="7febe8179f120cbe58ea255bc233ad5d1b4c106f3934eb8e670135a8b7bd09c7") version("5.1.0", sha256="d9122189103ebafe7ec5aeb50e60f3e02af5c2747021f9071aab91e7f875c29e") version("5.0.2", sha256="b01adaf858b9c3683523b087a55fafb655864f5db8e2a1acdbf588f53d6972e2") @@ -109,6 +110,7 @@ class Rocalution(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) @@ -138,6 +140,7 @@ class Rocalution(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: for tgt in itertools.chain(["auto"], amdgpu_targets): depends_on( @@ -146,6 +149,9 @@ class Rocalution(CMakePackage): ) depends_on("googletest@1.10.0:", type="test") + # This fix is added to address the compilation failure and it is + # already taken in 5.2.3 rocm release. + patch("0003-fix-compilation-for-rocalution-5.2.0.patch", when="@5.2.0:") def check(self): exe = join_path(self.build_directory, "clients", "staging", "rocalution-test") @@ -177,17 +183,22 @@ class Rocalution(CMakePackage): def cmake_args(self): args = [ - self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake), self.define("SUPPORT_HIP", "ON"), self.define("SUPPORT_MPI", "OFF"), self.define("BUILD_CLIENTS_SAMPLES", "OFF"), self.define("BUILD_CLIENTS_TESTS", self.run_tests), ] - + if self.spec.satisfies("@3.7.0:5.1.3"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake)) + elif self.spec.satisfies("@5.2.0:"): + args.append(self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.lib.cmake.hip)) if "auto" not in self.spec.variants["amdgpu_target"]: args.append(self.define_from_variant("AMDGPU_TARGETS", "amdgpu_target")) if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) + return args diff --git a/var/spack/repos/builtin/packages/rocblas/package.py b/var/spack/repos/builtin/packages/rocblas/package.py index 04c5f683ef..32958a16cf 100644 --- a/var/spack/repos/builtin/packages/rocblas/package.py +++ b/var/spack/repos/builtin/packages/rocblas/package.py @@ -16,11 +16,12 @@ class Rocblas(CMakePackage): url = "https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.1.3.tar.gz" tags = ["rocm"] - maintainers = ["cgmb", "srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"] libraries = ["librocblas"] version("develop", branch="develop") version("master", branch="master") + version("5.2.0", sha256="b178b7db5f0af55b21b5f744b8825f5e002daec69b4688e50df2bca2fac155bd") version("5.1.3", sha256="915374431db8f0cecdc2bf318a0ad33c3a8eceedc461d7a06b92ccb02b07313c") version("5.1.0", sha256="efa0c424b5ada697314aa8a78c19c93ade15f1612c4bfc8c53d71d1c9719aaa3") version("5.0.2", sha256="358a0902fc279bfc80205659a90e96269cb7d83a80386b121e4e3dfe221fec23") @@ -140,6 +141,7 @@ class Rocblas(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("llvm-amdgpu@" + ver, type="build", when="@" + ver) @@ -175,6 +177,7 @@ class Rocblas(CMakePackage): ("@5.0.2", "75b9aefe5981d85d1df32ddcebf32dab52bfdabd"), ("@5.1.0", "ea38f8661281a37cd81c96cc07868e3f07d2c4da"), ("@5.1.3", "ea38f8661281a37cd81c96cc07868e3f07d2c4da"), + ("@5.2.0", "9ca08f38c4c3bfe6dfa02233637e7e3758c7b6db"), ]: resource( name="Tensile", @@ -196,7 +199,8 @@ class Rocblas(CMakePackage): patch("0001-Fix-compilation-error-with-StringRef-to-basic-string.patch", when="@:3.8") patch("0002-Fix-rocblas-clients-blas.patch", when="@4.2.0:4.3.1") patch("0003-Fix-rocblas-gentest.patch", when="@4.2.0:5.1") - patch("0004-Find-python.patch", when="@master:") + # Finding Python package and set command python as python3 + patch("0004-Find-python.patch", when="@5.2.0:") def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) @@ -247,6 +251,6 @@ class Rocblas(CMakePackage): args.append(self.define("__skip_rocmclang", "ON")) if self.spec.satisfies("@5.2.0:"): - args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", "ON")) + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/rocfft/package.py b/var/spack/repos/builtin/packages/rocfft/package.py index 047248dc06..6458b48803 100644 --- a/var/spack/repos/builtin/packages/rocfft/package.py +++ b/var/spack/repos/builtin/packages/rocfft/package.py @@ -13,12 +13,13 @@ class Rocfft(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocFFT/" git = "https://github.com/ROCmSoftwarePlatform/rocFFT.git" - url = "https://github.com/ROCmSoftwarePlatform/rocfft/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocfft/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"] libraries = ["librocfft"] + version("5.2.0", sha256="ebba280b7879fb4bc529a68072b98d4e815201f90d24144d672094bc241743d4") version("5.1.3", sha256="b4fcd03c1b07d465bb307ec33cc7fb50036dff688e497c5e52b2dec37f4cb618") version("5.1.0", sha256="dc11c9061753ae43a9d5db9c4674aa113a8adaf50818b2701cbb940894147f68") version("5.0.2", sha256="30d4bd5fa85185ddafc69fa6d284edd8033c9d77d1e351fa328267242995eb0a") @@ -118,13 +119,15 @@ class Rocfft(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) patch("0001-Improve-compilation-by-using-sqlite-recipe-for-rocfft.patch", when="@5.0.0:5.0.2") + # Patch to add spack build test support. No longer required from 5.2 patch("0002-Fix-clients-fftw3-include-dirs-rocm-4.2.patch", when="@4.2.0:4.3.1") - patch("0003-Fix-clients-fftw3-include-dirs-rocm-4.5.patch", when="@4.5.0:") + patch("0003-Fix-clients-fftw3-include-dirs-rocm-4.5.patch", when="@4.5.0:5.1") def setup_build_environment(self, env): env.set("CXX", self.spec["hip"].hipcc) @@ -171,4 +174,6 @@ class Rocfft(CMakePackage): if self.spec.satisfies("@5.0.0:"): args.append(self.define("SQLITE_USE_SYSTEM_PACKAGE", "ON")) + if self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py index 1f1e74542f..08d21085bd 100644 --- a/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py +++ b/var/spack/repos/builtin/packages/rocm-bandwidth-test/package.py @@ -12,13 +12,14 @@ class RocmBandwidthTest(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test" git = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test.git" - url = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocm_bandwidth_test/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] version("master", branch="master") + version("5.2.0", sha256="046f2a6984c62899f57a557490136fbe7ab28e2fd334750abac71b03609226ef") version("5.1.3", sha256="6a6e7fb998c886951db75dcf34dca523d9caaff8d0ccf2b7431504a1808b1ff3") version("5.1.0", sha256="18fe51f0ba61760fc89ffc81f737fd4fa20fb4b00df3f35145be77c3e0a6162b") version("5.0.2", sha256="c93f7dbb37233aa32d81057fa8b3fa88d7c7be9b7916430b5ffc701600a5ff45") @@ -102,6 +103,7 @@ class RocmBandwidthTest(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("hsa-rocr-dev@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py index 96c1523f65..cf69a36d30 100644 --- a/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py +++ b/var/spack/repos/builtin/packages/rocm-clang-ocl/package.py @@ -11,12 +11,13 @@ class RocmClangOcl(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/clang-ocl" git = "https://github.com/RadeonOpenCompute/clang-ocl.git" - url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/clang-ocl/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] version("master", branch="master") + version("5.2.0", sha256="a2059f6aeccc119abbd444cb37128e00e4854e22a88a47f120f8f8b947d862c5") version("5.1.3", sha256="e19ee15f26fc03309398ac73cc738508c0e1617deccfd667d369a3948b5d3552") version("5.1.0", sha256="38d9e2e98cff1a262fdd45c3239fd76a9f6ad5eff38a31aa19c3bb0faea53375") version("5.0.2", sha256="5e8f39200227388817024ee7ce46a996e43e433ed308f8d5e8e4c03629d8a5e7") @@ -100,6 +101,7 @@ class RocmClangOcl(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocm-cmake/package.py b/var/spack/repos/builtin/packages/rocm-cmake/package.py index e994fc2454..6313ba0f33 100644 --- a/var/spack/repos/builtin/packages/rocm-cmake/package.py +++ b/var/spack/repos/builtin/packages/rocm-cmake/package.py @@ -13,13 +13,13 @@ class RocmCmake(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/rocm-cmake" git = "https://github.com/RadeonOpenCompute/rocm-cmake.git" - url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] version("master", branch="master") - + version("5.2.0", sha256="be8646c4f7babfe9a103c97d0e9f369322f8ac6cfa528edacdbdcf7f3ef44943") version("5.1.3", sha256="19b2da0d56300aab454655b57435ab3ed9e101ecb96561336ea8865bbd993c23") version("5.1.0", sha256="2eff47b7cf5bd56d465ff3c110eb936d31860df60182a82ba511ba11bbcf23fc") version("5.0.2", sha256="86a4ae0f84dcf5be95a252295eb732d6a7a271297eed37800a9d492c16474d0c") diff --git a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py index 4a39c30d91..5cbdd104dc 100644 --- a/var/spack/repos/builtin/packages/rocm-dbgapi/package.py +++ b/var/spack/repos/builtin/packages/rocm-dbgapi/package.py @@ -16,13 +16,14 @@ class RocmDbgapi(CMakePackage): homepage = "https://github.com/ROCm-Developer-Tools/ROCdbgapi" git = "https://github.com/ROCm-Developer-Tools/ROCdbgapi.git" - url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-5.0.0.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/ROCdbgapi/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librocm-dbgapi"] version("master", branch="amd-master") + version("5.2.0", sha256="44f0528a7583bc59b6585166d2289970b20115c4c70e3bcc218aff19fc242b3f") version("5.1.3", sha256="880f80ebf741e3451676837f720551e02cffd0b9346ca4dfa6cf7f7043282f2b") version("5.1.0", sha256="406db4b20bda12f6f32cbef88b03110aa001bf7bef6676f36e909b53c8354e43") version("5.0.2", sha256="b7554dfe96bda6c2ee762ad6e3e5f91f0f52b5a525e3fb29d5e1fe6f003652b5") @@ -106,6 +107,7 @@ class RocmDbgapi(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("hsa-rocr-dev@" + ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py index 5625c910b0..1b0b5a7bd8 100644 --- a/var/spack/repos/builtin/packages/rocm-debug-agent/package.py +++ b/var/spack/repos/builtin/packages/rocm-debug-agent/package.py @@ -13,12 +13,13 @@ class RocmDebugAgent(CMakePackage): homepage = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent" git = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent.git" - url = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/rocr_debug_agent/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librocm-debug-agent"] + version("5.2.0", sha256="f8e8d5ad691033d0c0f1850d69f35c98ba9722ab4adc66c4251f22257f56f0a2") version("5.1.3", sha256="ef26130829f3348d503669467ab1ea39fb67d943d88d64e7ac04b9617ec6067d") version("5.1.0", sha256="e0ceeef575d8645385bc6e4c9c3accaa192a93c42d83545cf5626c848f59806b") version("5.0.2", sha256="4ec3cdedc4ba774d05c3dc972186b3181b3aa823af08f3843238961d5ef90e57") @@ -112,6 +113,7 @@ class RocmDebugAgent(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("hsakmt-roct@" + ver, when="@" + ver) @@ -132,6 +134,7 @@ class RocmDebugAgent(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-dbgapi@" + ver, when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -153,7 +156,7 @@ class RocmDebugAgent(CMakePackage): @property def root_cmakelists_dir(self): - if "@3.5.0" in self.spec: + if self.spec.satisfies("@3.5.0"): return "src" else: return self.stage.source_path @@ -162,13 +165,15 @@ class RocmDebugAgent(CMakePackage): spec = self.spec args = [] - if "@3.5.0" in spec: + if spec.satisfies("@3.5.0"): args.append( "-DCMAKE_PREFIX_PATH={0}/include/hsa;{1}/include,".format( spec["hsa-rocr-dev"].prefix, spec["hsakmt-roct"].prefix ) ) - if "@3.7.0:" in spec: - args.append("-DCMAKE_MODULE_PATH={0}".format(spec["hip"].prefix.cmake)) + if spec.satisfies("@3.7.0:5.1"): + args.append(self.define("CMAKE_MODULE_PATH", spec["hip"].prefix.cmake)) + elif spec.satisfies("@5.2.0:"): + args.append(self.define("CMAKE_MODULE_PATH", spec["hip"].prefix.lib.cmake.hip)) return args diff --git a/var/spack/repos/builtin/packages/rocm-device-libs/package.py b/var/spack/repos/builtin/packages/rocm-device-libs/package.py index f3f99c8d0c..47fec671e0 100644 --- a/var/spack/repos/builtin/packages/rocm-device-libs/package.py +++ b/var/spack/repos/builtin/packages/rocm-device-libs/package.py @@ -15,9 +15,10 @@ class RocmDeviceLibs(CMakePackage): url = "https://github.com/RadeonOpenCompute/ROCm-Device-Libs/archive/rocm-5.1.3.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] version("master", branch="amd-stg-open") + version("5.2.0", sha256="901674bc941115c72f82c5def61d42f2bebee687aefd30a460905996f838e16c") version("5.1.3", sha256="c41958560ec29c8bf91332b9f668793463904a2081c330c0d828bf2f91d4f04e") version("5.1.0", sha256="47dbcb41fb4739219cadc9f2b5f21358ed2f9895ce786d2f7a1b2c4fd044d30f") version("5.0.2", sha256="49cfa8f8fc276ba27feef40546788a2aabe259a924a97af8bef24e295d19aa5e") @@ -111,6 +112,7 @@ class RocmDeviceLibs(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("llvm-amdgpu@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocm-gdb/package.py b/var/spack/repos/builtin/packages/rocm-gdb/package.py index e620d57e97..3cc6a5a52a 100644 --- a/var/spack/repos/builtin/packages/rocm-gdb/package.py +++ b/var/spack/repos/builtin/packages/rocm-gdb/package.py @@ -12,11 +12,12 @@ class RocmGdb(AutotoolsPackage): based on GDB, the GNU source-level debugger.""" homepage = "https://github.com/ROCm-Developer-Tools/ROCgdb/" - url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/ROCgdb/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="70c5b443292b9bb114844eb63b72cfab1b65f083511ee39d55db7a633c63bf5a") version("5.1.3", sha256="81f5e368facdcc424a37cb5809f0b436bedb9a6d9af4d17785b3c446ab0a7821") version("5.1.0", sha256="cf638149b269f838aaec59c5801098b9c0fc42f6c86a39309a8995b56978b424") version("5.0.2", sha256="0eced8cd5a2996cb4bcf254f2bd9defe24112d21c2f750e98f784ecdf94ba5c9") @@ -102,6 +103,7 @@ class RocmGdb(AutotoolsPackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-dbgapi@" + ver, type="link", when="@" + ver) depends_on("comgr@" + ver, type="link", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocm-opencl/package.py b/var/spack/repos/builtin/packages/rocm-opencl/package.py index c28a4fce55..ff85976a80 100644 --- a/var/spack/repos/builtin/packages/rocm-opencl/package.py +++ b/var/spack/repos/builtin/packages/rocm-opencl/package.py @@ -15,7 +15,7 @@ class RocmOpencl(CMakePackage): git = "https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime.git" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["libOpenCL"] def url_for_version(self, version): @@ -28,7 +28,7 @@ class RocmOpencl(CMakePackage): return url.format(version) version("master", branch="main") - + version("5.2.0", sha256="80f73387effdcd987a150978775a87049a976aa74f5770d4420847b004dd59f0") version("5.1.3", sha256="44a7fac721abcd93470e1a7e466bdea0c668c253dee93e4f1ea9a72dbce4ba31") version("5.1.0", sha256="362d81303048cf7ed5d2f69fb65ed65425bc3da4734fff83e3b8fbdda51b0927") version("5.0.2", sha256="3edb1992ba28b4a7f82dd66fbd121f62bd859c1afb7ceb47fa856bd68feedc95") @@ -98,6 +98,7 @@ class RocmOpencl(CMakePackage): depends_on("numactl", type="link", when="@3.7.0:") for d_version, d_shasum in [ + ("5.2.0", "37f5fce04348183bce2ece8bac1117f6ef7e710ca68371ff82ab08e93368bafb"), ("5.1.3", "ddee63cdc6515c90bab89572b13e1627b145916cb8ede075ef8446cbb83f0a48"), ("5.1.0", "f4f265604b534795a275af902b2c814f416434d9c9e16db81b3ed5d062187dfa"), ("5.0.2", "34decd84652268dde865f38e66f8fb4750a08c2457fea52ad962bced82a03e5e"), @@ -116,7 +117,8 @@ class RocmOpencl(CMakePackage): placement="rocclr", when="@{0}".format(d_version), ) - patch("0001-fix-build-error-rocm-opencl-5.1.0.patch", when="@5.1.0:") + # Patch to set package installation path for OpenCL. + patch("0001-fix-build-error-rocm-opencl-5.1.0.patch", when="@5.1.0:5.1") for ver in [ "3.5.0", @@ -149,6 +151,7 @@ class RocmOpencl(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("comgr@" + ver, type="build", when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py index 41a5d2f207..23f7d6a2e3 100644 --- a/var/spack/repos/builtin/packages/rocm-smi-lib/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi-lib/package.py @@ -17,13 +17,14 @@ class RocmSmiLib(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/rocm_smi_lib" git = "https://github.com/RadeonOpenCompute/rocm_smi_lib.git" - url = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librocm_smi64"] version("master", branch="master") + version("5.2.0", sha256="7bce567ff4e087598eace2cae72d24c98b2bcc93af917eafa61ec9d1e8ef4477") version("5.1.3", sha256="8a19ce60dc9221545aa50e83e88d8c4be9bf7cde2425cefb13710131dc1d7b1b") version("5.1.0", sha256="21b31b43015b77a9119cf4c1d4ff3864f9ef1f34e2a52a38f985a3f710dc5f87") version("5.0.2", sha256="a169129e4ecd1cca134039dc1bf91e1b3721768781abfae4ae61fad60a633472") @@ -110,8 +111,9 @@ class RocmSmiLib(CMakePackage): @run_after("install") def post_install(self): - shutil.rmtree(self.prefix.lib) - install_tree(self.prefix.rocm_smi, self.prefix) - shutil.rmtree(self.prefix.rocm_smi) - os.remove(join_path(self.prefix.bin, "rsmiBindings.py")) - symlink("../bindings/rsmiBindings.py", join_path(self.prefix.bin, "rsmiBindings.py")) + if self.spec.satisfies("@:5.1"): + shutil.rmtree(self.prefix.lib) + install_tree(self.prefix.rocm_smi, self.prefix) + shutil.rmtree(self.prefix.rocm_smi) + os.remove(join_path(self.prefix.bin, "rsmiBindings.py")) + symlink("../bindings/rsmiBindings.py", join_path(self.prefix.bin, "rsmiBindings.py")) diff --git a/var/spack/repos/builtin/packages/rocm-smi/package.py b/var/spack/repos/builtin/packages/rocm-smi/package.py index 79f5a2aa32..3de135fbac 100644 --- a/var/spack/repos/builtin/packages/rocm-smi/package.py +++ b/var/spack/repos/builtin/packages/rocm-smi/package.py @@ -20,7 +20,8 @@ class RocmSmi(MakefilePackage): homepage = "https://github.com/RadeonOpenCompute/ROC-smi" url = "https://github.com/RadeonOpenCompute/ROC-smi/archive/rocm-4.1.0.tar.gz" - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + tags = ["rocm"] version( "4.1.0", diff --git a/var/spack/repos/builtin/packages/rocm-tensile/package.py b/var/spack/repos/builtin/packages/rocm-tensile/package.py index 2a4254de8e..2ece5414f4 100644 --- a/var/spack/repos/builtin/packages/rocm-tensile/package.py +++ b/var/spack/repos/builtin/packages/rocm-tensile/package.py @@ -13,11 +13,12 @@ class RocmTensile(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/Tensile/" git = "https://github.com/ROCmSoftwarePlatform/Tensile.git" - url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] + version("5.2.0", sha256="aa6107944482ad278111d11d2e926393423fc70e7e1838574fe7ad9f553bdacf") version("5.1.3", sha256="87020ca268e3a1ed8853f629839d6497764d862bd70b8775e98de439f6c89f1d") version("5.1.0", sha256="0ac86a623597152c5b1d8bb5634aad3e55afa51959476aaa5e9869d259ddf375") version("5.0.2", sha256="c6130de3b02f4f10635d18f913b3b88ea754fce2842c680e9caf5a6781da8f37") @@ -123,6 +124,7 @@ class RocmTensile(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-cmake@" + ver, type="build", when="@" + ver) depends_on("hip@" + ver, when="@" + ver) @@ -146,6 +148,7 @@ class RocmTensile(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("rocm-smi-lib@" + ver, type="build", when="@" + ver) @@ -178,7 +181,7 @@ class RocmTensile(CMakePackage): self.define("Tensile_LOGIC", "asm_full"), self.define("Tensile_CODE_OBJECT_VERSION", "V3"), self.define("Boost_USE_STATIC_LIBS", "OFF"), - self.define("TENSILE_USE_OPENMP", "ON"), + self.define("TENSILE_USE_OPENMP", "OFF"), self.define("BUILD_WITH_TENSILE_HOST", "ON" if "@3.7.0:" in self.spec else "OFF"), ] diff --git a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py index 0c98ccef85..fbc0cc0358 100644 --- a/var/spack/repos/builtin/packages/rocm-validation-suite/package.py +++ b/var/spack/repos/builtin/packages/rocm-validation-suite/package.py @@ -16,11 +16,12 @@ class RocmValidationSuite(CMakePackage): compatible platform.""" homepage = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite" - url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/ROCmValidationSuite/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="2dfef5d66f544230957ac9aaf647b2f1dccf3cc7592cc322cae9fbdcf3321365") version("5.1.3", sha256="0140a4128c31749c078d9e1dc863cbbd690efc65843c34a4b80f0056e5b8c7b6") version("5.1.0", sha256="d9b9771b885bd94e5d0352290d3fe0fa12f94ce3f384c3844002cd7614880010") version("5.0.2", sha256="f249fe700a5a96c6dabf12130a3e366ae6025fe1442a5d11d08801d6c0265af4") @@ -119,13 +120,27 @@ class RocmValidationSuite(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) - depends_on("hip-rocclr@" + ver, when="@" + ver) depends_on("rocminfo@" + ver, when="@" + ver) depends_on("rocblas@" + ver, when="@" + ver) depends_on("rocm-smi-lib@" + ver, when="@" + ver) + for ver in [ + "3.5.0", + "3.7.0", + "3.8.0", + "3.9.0", + "3.10.0", + "4.0.0", + "4.1.0", + "4.2.0", + "4.3.0", + "4.3.1", + ]: + depends_on("hip-rocclr@" + ver, when="@" + ver) + def patch(self): if "@4.5.0:" in self.spec: filter_file( diff --git a/var/spack/repos/builtin/packages/rocminfo/package.py b/var/spack/repos/builtin/packages/rocminfo/package.py index b49e334857..5ded25e201 100644 --- a/var/spack/repos/builtin/packages/rocminfo/package.py +++ b/var/spack/repos/builtin/packages/rocminfo/package.py @@ -12,13 +12,13 @@ class Rocminfo(CMakePackage): homepage = "https://github.com/RadeonOpenCompute/rocminfo" git = "https://github.com/RadeonOpenCompute/rocminfo.git" - url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["srekolam", "renjithravindrankannath", "haampie"] version("master", branch="master") - + version("5.2.0", sha256="e721eb81efd384abd22ff01cdcbb6245b11084dc11a867c74c8ad6b028aa0404") version("5.1.3", sha256="7aecd7b189e129b77c8f2af70be2926a0f3a5ee89814879bc8477924a7e6f2ae") version("5.1.0", sha256="76f6cc9e69d9fc7e692e5c7db35e89079d3b1d2d47632e4742d612e743c396d3") version("5.0.2", sha256="5fd970f08c5d6591efe7379ece564ce5580cba87fb6237531dabbd5adcb6a899") @@ -102,6 +102,7 @@ class Rocminfo(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", "master", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocprim/package.py b/var/spack/repos/builtin/packages/rocprim/package.py index 1f6b264eb9..ccabfcfc83 100644 --- a/var/spack/repos/builtin/packages/rocprim/package.py +++ b/var/spack/repos/builtin/packages/rocprim/package.py @@ -11,11 +11,12 @@ class Rocprim(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocPRIM" git = "https://github.com/ROCmSoftwarePlatform/rocPRIM.git" - url = "https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="f99eb7d2f6b1445742fba631a0dc8bb0d464a767a9c4fb79ac865d9570fe747b") version("5.1.3", sha256="b5a08d2e76388bd1ffa6c946009928fe95de846ab6b65a6475998070c0cf6dc1") version("5.1.0", sha256="dfe106c01155e00ed816f0231d1576ff8c08750cc8278fa453926f388dc6fe48") version("5.0.2", sha256="a4280f15d470699a1c6a5f86bdd951c1387e0af227c6bee6f81cee658406f4b0") @@ -104,6 +105,7 @@ class Rocprim(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("comgr@" + ver, when="@" + ver) @@ -116,7 +118,6 @@ class Rocprim(CMakePackage): def cmake_args(self): args = [ - self.define("CMAKE_MODULE_PATH", self.spec["hip"].prefix.cmake), self.define("ONLY_INSTALL", "ON"), self.define("BUILD_TEST", "OFF"), self.define("BUILD_BENCHMARK", "OFF"), @@ -129,4 +130,9 @@ class Rocprim(CMakePackage): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@:5.1.3"): + args.append("-DCMAKE_MODULE_PATH={0}".format(self.spec["hip"].prefix.cmake)) + elif self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) + return args diff --git a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py index e1d165cfde..28bf4e6167 100644 --- a/var/spack/repos/builtin/packages/rocprofiler-dev/package.py +++ b/var/spack/repos/builtin/packages/rocprofiler-dev/package.py @@ -13,12 +13,13 @@ class RocprofilerDev(CMakePackage): homepage = "https://github.com/ROCm-Developer-Tools/rocprofiler" git = "https://github.com/ROCm-Developer-Tools/rocprofiler.git" - url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/refs/tags/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/rocprofiler/archive/refs/tags/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["librocprofiler64"] + version("5.2.0", sha256="1f4db27b56ef1863d4c9e1d96bac9117d66be45156d0637cfe4fd38cae61a23a") version("5.1.3", sha256="eca7be451c7bf000fd9c75683e7f5dfbed32dbb385b5ac685d2251ee8c3abc96") version("5.1.0", sha256="4a1c6ed887b0159392406af8796508df2794353a4c3aacc801116044fb4a10a5") version("5.0.2", sha256="48f58c3c16dd45fead2086f89a175f74636e81bc2437e30bb6e9361b1083e71d") @@ -101,6 +102,7 @@ class RocprofilerDev(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) diff --git a/var/spack/repos/builtin/packages/rocrand/package.py b/var/spack/repos/builtin/packages/rocrand/package.py index ff4ccbd930..1eba3ab1f9 100644 --- a/var/spack/repos/builtin/packages/rocrand/package.py +++ b/var/spack/repos/builtin/packages/rocrand/package.py @@ -16,12 +16,13 @@ class Rocrand(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocRAND" git = "https://github.com/ROCmSoftwarePlatform/rocRAND.git" - url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] libraries = ["librocrand"] + version("5.2.0", sha256="ab3057e7c17a9fbe584f89ef98ec92a74d638a98d333e7d0f64daf7bc9051e38") version("5.1.3", sha256="4a19e1bcb60955a02a73ad64594c23886d6749afe06b0104e2b877dbe02c8d1c") version("5.1.0", sha256="0c6f114a775d0b38be71f3f621a10bde2104a1f655d5d68c5fecb79b8b51a815") version("5.0.2", sha256="2dbce2a7fb273c2f9456c002adf3a510b9ec79f2ff32dfccdd59948f3ddb1505") @@ -120,6 +121,7 @@ class Rocrand(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocm-cmake@%s:" % ver, type="build", when="@" + ver) @@ -169,8 +171,9 @@ class Rocrand(CMakePackage): with working_dir(rocrand_path): for header_file in rocrand_includes: os.symlink(join_path("include", header_file), header_file) - else: - os.mkdir(os.path.join(self.prefix, "hiprand")) + elif self.spec.satisfies("@5.1.0:5.1.3"): + if not os.path.isdir(os.path.join(self.prefix, "hiprand")): + os.mkdir(os.path.join(self.prefix, "hiprand")) os.mkdir(os.path.join(self.prefix, "hiprand", "include")) hiprand_include_path = join_path(self.prefix, "include", "hiprand") with working_dir(hiprand_include_path): diff --git a/var/spack/repos/builtin/packages/rocsolver/package.py b/var/spack/repos/builtin/packages/rocsolver/package.py index 421d7788d7..a68e9cd3a6 100644 --- a/var/spack/repos/builtin/packages/rocsolver/package.py +++ b/var/spack/repos/builtin/packages/rocsolver/package.py @@ -15,10 +15,10 @@ class Rocsolver(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocSOLVER" git = "https://github.com/ROCmSoftwarePlatform/rocSOLVER.git" - url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-5.0.2.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["cgmb", "srekolam", "arjun-raj-kuppala", "haampie"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath", "haampie"] libraries = ["librocsolver"] amdgpu_targets = ROCmPackage.amdgpu_targets @@ -34,6 +34,7 @@ class Rocsolver(CMakePackage): version("develop", branch="develop") version("master", branch="master") + version("5.2.0", sha256="94d46ebe1266eaa05df50c1789dc27d3f2dbf3cb5af156e757777a82ed6ef356") version("5.1.3", sha256="5a8f3b95ac9a131c31538196e954ea53b863009c092cce0c0ef869a0cd5dd554") version("5.1.0", sha256="88de515a6e75eaa3c50c9c8ae1e7ae8e3b46e712e388f44f79b63fefa9fc0831") version("5.0.2", sha256="298e0903f1ba8074055ab072690f967062d6e06a9371574de23e4e38d2997688") @@ -137,6 +138,7 @@ class Rocsolver(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocblas@" + ver, when="@" + ver) @@ -186,7 +188,7 @@ class Rocsolver(CMakePackage): args.append(self.define("ROCSOLVER_EMBED_FMT", "ON")) if self.spec.satisfies("@5.2.0:"): - args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", "ON")) + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/rocsparse/package.py b/var/spack/repos/builtin/packages/rocsparse/package.py index 2707e9eb20..66e2983676 100644 --- a/var/spack/repos/builtin/packages/rocsparse/package.py +++ b/var/spack/repos/builtin/packages/rocsparse/package.py @@ -18,10 +18,10 @@ class Rocsparse(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocSPARSE" git = "https://github.com/ROCmSoftwarePlatform/rocSPARSE.git" - url = "https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-5.0.0.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] libraries = ["librocsparse"] amdgpu_targets = ROCmPackage.amdgpu_targets @@ -34,6 +34,7 @@ class Rocsparse(CMakePackage): description="CMake build type", ) + version("5.2.0", sha256="7ed929af16d2502135024a6463997d9a95f03899b8a33aa95db7029575c89572") version("5.1.3", sha256="ef9641045b36c9aacc87e4fe7717b41b1e29d97e21432678dce7aca633a8edc2") version("5.1.0", sha256="a2f0f8cb02b95993480bd7264fc65e8b11464a90b86f2dcd0dd82a2e6d4bd704") version("5.0.2", sha256="c9d9e1b7859e1c5aa5050f5dfdf86245cbd7c1296c0ce60d9ca5f3e22a9b748b") @@ -110,6 +111,7 @@ class Rocsparse(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) for tgt in itertools.chain(["auto"], amdgpu_targets): @@ -146,4 +148,6 @@ class Rocsparse(CMakePackage): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) return args diff --git a/var/spack/repos/builtin/packages/rocthrust/package.py b/var/spack/repos/builtin/packages/rocthrust/package.py index e0eee30ced..572ea2ce54 100644 --- a/var/spack/repos/builtin/packages/rocthrust/package.py +++ b/var/spack/repos/builtin/packages/rocthrust/package.py @@ -14,11 +14,12 @@ class Rocthrust(CMakePackage): homepage = "https://github.com/ROCmSoftwarePlatform/rocThrust" git = "https://github.com/ROCmSoftwarePlatform/rocThrust.git" - url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["cgmb", "srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="afa126218485586682c78e97df8025ae4efd32f3751c340e84c436e08868c326") version("5.1.3", sha256="8d92de1e69815d92a423b7657f2f37c90f1d427f5bc92915c202d4c266254dad") version("5.1.0", sha256="fee779ae3d55b97327d87beca784fc090fa02bc95238d9c3bf3021e266e73979") version("5.0.2", sha256="60f0cf1848cc7cd8663f15307bd695eee3c5b20d3ad3baa4bc696189ffdcfd53") @@ -103,6 +104,7 @@ class Rocthrust(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hip@" + ver, when="@" + ver) depends_on("rocprim@" + ver, when="@" + ver) @@ -117,4 +119,7 @@ class Rocthrust(CMakePackage): if self.spec.satisfies("^cmake@3.21.0:3.21.2"): args.append(self.define("__skip_rocmclang", "ON")) + if self.spec.satisfies("@5.2.0:"): + args.append(self.define("BUILD_FILE_REORG_BACKWARD_COMPATIBILITY", True)) + return args diff --git a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py index 1587578519..bc2c9cfd4b 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev-api/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev-api/package.py @@ -13,11 +13,12 @@ class RoctracerDevApi(Package): homepage = "https://github.com/ROCm-Developer-Tools/roctracer" git = "https://github.com/ROCm-Developer-Tools/roctracer.git" - url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.0.2.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/refs/tags/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] + version("5.2.0", sha256="9747356ce61c57d22c2e0a6c90b66a055e435d235ba3459dc3e3f62aabae6a03") version("5.1.3", sha256="45f19875c15eb609b993788b47fd9c773b4216074749d7744f3a671be17ef33c") version("5.1.0", sha256="58b535f5d6772258190e4adcc23f37c916f775057a91b960e1f2ee1f40ed5aac") version("5.0.2", sha256="5ee46f079e57dfe491678ffa4cdaf5f3b3d179cb3137948e4bcafca99ded47cc") diff --git a/var/spack/repos/builtin/packages/roctracer-dev/package.py b/var/spack/repos/builtin/packages/roctracer-dev/package.py index 797d111868..8cea5c7427 100644 --- a/var/spack/repos/builtin/packages/roctracer-dev/package.py +++ b/var/spack/repos/builtin/packages/roctracer-dev/package.py @@ -15,12 +15,13 @@ class RoctracerDev(CMakePackage): homepage = "https://github.com/ROCm-Developer-Tools/roctracer" git = "https://github.com/ROCm-Developer-Tools/roctracer.git" - url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.1.3.tar.gz" + url = "https://github.com/ROCm-Developer-Tools/roctracer/archive/rocm-5.2.0.tar.gz" tags = ["rocm"] - maintainers = ["srekolam", "arjun-raj-kuppala"] + maintainers = ["srekolam", "renjithravindrankannath"] libraries = ["libroctracer64"] + version("5.2.0", sha256="9747356ce61c57d22c2e0a6c90b66a055e435d235ba3459dc3e3f62aabae6a03") version("5.1.3", sha256="45f19875c15eb609b993788b47fd9c773b4216074749d7744f3a671be17ef33c") version("5.1.0", sha256="58b535f5d6772258190e4adcc23f37c916f775057a91b960e1f2ee1f40ed5aac") version("5.0.2", sha256="5ee46f079e57dfe491678ffa4cdaf5f3b3d179cb3137948e4bcafca99ded47cc") @@ -107,13 +108,25 @@ class RoctracerDev(CMakePackage): "5.0.2", "5.1.0", "5.1.3", + "5.2.0", ]: depends_on("hsakmt-roct@" + ver, when="@" + ver) depends_on("hsa-rocr-dev@" + ver, when="@" + ver) depends_on("rocminfo@" + ver, when="@" + ver) depends_on("hip@" + ver, when="@" + ver) - for ver in ["4.2.0", "4.3.0", "4.3.1", "4.5.0", "4.5.2", "5.0.0", "5.0.2", "5.1.0", "5.1.3"]: + for ver in [ + "4.2.0", + "4.3.0", + "4.3.1", + "4.5.0", + "4.5.2", + "5.0.0", + "5.0.2", + "5.1.0", + "5.1.3", + "5.2.0", + ]: depends_on("rocprofiler-dev@" + ver, when="@" + ver) @classmethod |