diff --git a/docs/_source/_static/scripts/rocm-6.0.2/build-clr.sh b/docs/_source/_static/scripts/rocm-6.0.2/build-clr.sh index af43090..907731b 100755 --- a/docs/_source/_static/scripts/rocm-6.0.2/build-clr.sh +++ b/docs/_source/_static/scripts/rocm-6.0.2/build-clr.sh @@ -46,64 +46,6 @@ sudo dpkg -i build/rocm-opencl_2.0.0-local_amd64.deb \ build/rocm-ocl-icd_2.0.0-local_amd64.deb exit -# rocclr -# Note rocclr is now in this sub-directory, but it isn't built -# separately anymore, according to docs. -# But when building clr, it doesn't include rocclr files. XXX -cd rocclr -rm -rf build -cmake -B build -G Ninja \ - -DCLR_BUILD_HIP=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/rocm \ - -DHIP_COMMON_DIR=/home/jebba/devel/ROCm/hip \ - -DCMAKE_PREFIX_PATH="/opt/rocm/" \ - -DHIP_PLATFORM=amd \ - -DCPACK_BINARY_DEB=ON \ - -DCPACK_BINARY_STGZ=OFF \ - -DCPACK_BINARY_TGZ=OFF \ - -DCPACK_BINARY_TZ=OFF \ - -DCPACK_SOURCE_TBZ2=OFF \ - -DCPACK_SOURCE_TGZ=OFF \ - -DCPACK_SOURCE_TZ=OFF \ - -DCPACK_GENERATOR=DEB \ - -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm \ - -DROCM_PATH=/opt/rocm \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DHIPCC_BIN_DIR=/opt/rocm/bin \ - -DCLR_BUILD_HIP=ON \ - -DUSE_PROF_API=OFF \ - -DOpenGL_GL_PREFERENCE=GLVND + file STRINGS file "/home/jebba/devel/ROCm/hip/VERSION" cannot be read. -# hipamd -# This requires rocclr files to build. -# ../rocclr/include/vdi_common.hpp -cd hipamd - -rm -rf build -cmake -B build -G Ninja \ - -DCLR_BUILD_HIP=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/rocm \ - -DHIP_COMMON_DIR=/home/jebba/devel/ROCm/hip \ - -DCMAKE_PREFIX_PATH="/opt/rocm/" \ - -DHIP_PLATFORM=amd \ - -DCPACK_BINARY_DEB=ON \ - -DCPACK_BINARY_STGZ=OFF \ - -DCPACK_BINARY_TGZ=OFF \ - -DCPACK_BINARY_TZ=OFF \ - -DCPACK_SOURCE_TBZ2=OFF \ - -DCPACK_SOURCE_TGZ=OFF \ - -DCPACK_SOURCE_TZ=OFF \ - -DCPACK_GENERATOR=DEB \ - -DCPACK_PACKAGING_INSTALL_PREFIX=/opt/rocm \ - -DROCM_PATH=/opt/rocm \ - -DCMAKE_C_COMPILER=clang \ - -DCMAKE_CXX_COMPILER=clang++ \ - -DHIPCC_BIN_DIR=/opt/rocm/bin \ - -DCLR_BUILD_HIP=ON \ - -DUSE_PROF_API=OFF - -ninja -C build package diff --git a/docs/_source/_static/scripts/rocm-6.0.2/build-hip.sh b/docs/_source/_static/scripts/rocm-6.0.2/build-hip.sh new file mode 100755 index 0000000..27e8fa5 --- /dev/null +++ b/docs/_source/_static/scripts/rocm-6.0.2/build-hip.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +rm -rf clr +git clone https://github.com/ROCm/HIP hip +cd hip/ +git checkout rocm-6.0.2 + +rm -rf build diff --git a/docs/_source/locale/en/LC_MESSAGES/toolchain-6.0.2.po b/docs/_source/locale/en/LC_MESSAGES/toolchain-6.0.2.po index 4fb2a2c..36bea73 100644 --- a/docs/_source/locale/en/LC_MESSAGES/toolchain-6.0.2.po +++ b/docs/_source/locale/en/LC_MESSAGES/toolchain-6.0.2.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tinyrocs 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-02-02 12:59-0700\n" +"POT-Creation-Date: 2024-02-02 13:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language: en\n" @@ -169,93 +169,94 @@ msgid "Perhaps the second pass, something like this:" msgstr "" #: ../../../_source/toolchain-6.0.2.rst:126 -msgid "clr" -msgstr "" - -#: ../../../_source/toolchain-6.0.2.rst:127 -msgid "OpenCL and more." -msgstr "" - -#: ../../../_source/toolchain-6.0.2.rst:129 -msgid "``Please pass hipcc/build or hipcc/bin using -DHIPCC_BIN_DIR.``" -msgstr "" - -#: ../../../_source/toolchain-6.0.2.rst:136 msgid "hipcc" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:137 +#: ../../../_source/toolchain-6.0.2.rst:127 msgid "hipcc built under clr. This seems better." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:144 -msgid "rocminfo" +#: ../../../_source/toolchain-6.0.2.rst:134 +msgid "clr" +msgstr "" + +#: ../../../_source/toolchain-6.0.2.rst:135 +msgid "OpenCL and more." +msgstr "" + +#: ../../../_source/toolchain-6.0.2.rst:137 +msgid "" +"``file STRINGS file \"/home/jebba/devel/ROCm/hip/VERSION\" cannot be read.``" msgstr "" #: ../../../_source/toolchain-6.0.2.rst:145 +msgid "rocminfo" +msgstr "" + +#: ../../../_source/toolchain-6.0.2.rst:146 msgid "Yes, ``rocminfo``" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:152 +#: ../../../_source/toolchain-6.0.2.rst:153 msgid "rocBLAS" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:153 +#: ../../../_source/toolchain-6.0.2.rst:154 msgid "Needed before hipBLAS." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:155 +#: ../../../_source/toolchain-6.0.2.rst:156 msgid "Set up this once:" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:172 +#: ../../../_source/toolchain-6.0.2.rst:173 msgid "rocprim" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:173 +#: ../../../_source/toolchain-6.0.2.rst:174 msgid "``rocprim``." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:180 +#: ../../../_source/toolchain-6.0.2.rst:181 msgid "rocsparse" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:181 +#: ../../../_source/toolchain-6.0.2.rst:182 msgid "``rocsparse``." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:188 +#: ../../../_source/toolchain-6.0.2.rst:189 msgid "rocsolver" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:189 +#: ../../../_source/toolchain-6.0.2.rst:190 msgid "``rocsolver`` for hipBLAS." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:196 +#: ../../../_source/toolchain-6.0.2.rst:197 msgid "hipBLAS" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:197 +#: ../../../_source/toolchain-6.0.2.rst:198 msgid "``hipBLAS`` plz." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:204 +#: ../../../_source/toolchain-6.0.2.rst:205 msgid "rocm-bandwidth-test" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:205 +#: ../../../_source/toolchain-6.0.2.rst:206 msgid "``rocm-bandwidth-test``." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:212 +#: ../../../_source/toolchain-6.0.2.rst:213 msgid "HOLD" msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:213 +#: ../../../_source/toolchain-6.0.2.rst:214 msgid "Don't upgrade over these files. Debian has higher epochs." msgstr "" -#: ../../../_source/toolchain-6.0.2.rst:215 +#: ../../../_source/toolchain-6.0.2.rst:216 msgid "``apt-mark hold hipcc llvm rocm-cmake rocm-device-libs rocminfo``" msgstr "" diff --git a/docs/_source/toolchain-6.0.2.rst b/docs/_source/toolchain-6.0.2.rst index 246c05b..30514b4 100644 --- a/docs/_source/toolchain-6.0.2.rst +++ b/docs/_source/toolchain-6.0.2.rst @@ -122,16 +122,6 @@ Perhaps the second pass, something like this: :language: bash -clr ---- -OpenCL and more. - -``Please pass hipcc/build or hipcc/bin using -DHIPCC_BIN_DIR.`` - -.. literalinclude:: _static/scripts/rocm-6.0.2/build-clr.sh - :language: bash - - hipcc ----- hipcc built under clr. This seems better. @@ -140,6 +130,17 @@ hipcc built under clr. This seems better. :language: bash +clr +--- +OpenCL and more. + +``file STRINGS file "/home/jebba/devel/ROCm/hip/VERSION" cannot be read.`` + +.. literalinclude:: _static/scripts/rocm-6.0.2/build-clr.sh + :language: bash + + + rocminfo -------- Yes, ``rocminfo``