1
0
Fork 0

more cleanup

main
Jeff Moe 2024-01-30 10:46:14 -07:00
parent e6601192ed
commit aa61d468fc
4 changed files with 44 additions and 89 deletions

View File

@ -24,8 +24,7 @@ cmake -B build -G Ninja \
-DCLR_BUILD_HIP=ON \
-DCMAKE_C_COMPILER=clang \
-DCMAKE_CXX_COMPILER=clang++ \
-DCLR_BUILD_HIP=ON \
-DCLR_BUILD_HIP=ON
ninja -C build package

View File

@ -47,9 +47,3 @@ ninja -C build package
sudo dpkg -i build/rocm-opencl_2.0.0-local_amd64.deb \
build/rocm-opencl-dev_2.0.0-local_amd64.deb \
build/rocm-ocl-icd_2.0.0-local_amd64.deb
exit
-DCLR_BUILD_OCL=ON \
-DOpenGL_GL_PREFERENCE=GLVND \
-DROCCLR_ENABLE_HSA=OFF \
-DCMAKE_CXX_FLAGS="-I/opt/rocm/include/hsa" \

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: tinyrocs 0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-01-30 10:34-0700\n"
"POT-Creation-Date: 2024-01-30 10:45-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language: en\n"
@ -87,23 +87,23 @@ msgstr ""
msgid "Build ``rocm-core``."
msgstr ""
#: ../../../_source/toolchain.rst:56
#: ../../../_source/toolchain.rst:55
msgid "rocm-cmake"
msgstr ""
#: ../../../_source/toolchain.rst:57
#: ../../../_source/toolchain.rst:56
msgid "Build ``rocm-cmake``."
msgstr ""
#: ../../../_source/toolchain.rst:65
#: ../../../_source/toolchain.rst:63
msgid "amd-smi"
msgstr ""
#: ../../../_source/toolchain.rst:66
#: ../../../_source/toolchain.rst:64
msgid "Build ``amd-smi``."
msgstr ""
#: ../../../_source/toolchain.rst:73
#: ../../../_source/toolchain.rst:69
msgid ""
"After LLVM is built above, and the other packages, in particular ``rocm-"
"core``, perhaps ``device-libs`` can be built. In this build, the ``device-"
@ -111,152 +111,136 @@ msgid ""
"repo for device libs."
msgstr ""
#: ../../../_source/toolchain.rst:78
#: ../../../_source/toolchain.rst:74
msgid "``amd/hipcc`` --- HIP CC compiler (clang wrapper)."
msgstr ""
#: ../../../_source/toolchain.rst:80
#: ../../../_source/toolchain.rst:76
msgid "``amd/device-libs`` --- AMD device libs."
msgstr ""
#: ../../../_source/toolchain.rst:82
#: ../../../_source/toolchain.rst:78
msgid "``amd/comgr`` --- Code Object Manager."
msgstr ""
#: ../../../_source/toolchain.rst:86 ../../../_source/toolchain.rst:148
msgid "hipcc"
msgstr ""
#: ../../../_source/toolchain.rst:87
msgid "Build ``hipcc``."
msgstr ""
#: ../../../_source/toolchain.rst:89
msgid "XXX This is better below using ``clr`` repo. XXX ?"
msgstr ""
#: ../../../_source/toolchain.rst:96
#: ../../../_source/toolchain.rst:82
msgid "device-libs"
msgstr ""
#: ../../../_source/toolchain.rst:97
#: ../../../_source/toolchain.rst:83
msgid "Build ``device-libs``."
msgstr ""
#: ../../../_source/toolchain.rst:99
msgid "Fails with clang target error..."
msgstr ""
#: ../../../_source/toolchain.rst:106
#: ../../../_source/toolchain.rst:90
msgid "roct-thunk-interface"
msgstr ""
#: ../../../_source/toolchain.rst:107
#: ../../../_source/toolchain.rst:91
msgid "Build ``roct-thunk-interface``."
msgstr ""
#: ../../../_source/toolchain.rst:115
#: ../../../_source/toolchain.rst:98
msgid "rocr-runtime"
msgstr ""
#: ../../../_source/toolchain.rst:116
#: ../../../_source/toolchain.rst:99
msgid ""
"Build ``rocr-runtime``. Needs hsakmtConfig.cmake from ROCT-Thunk-Interface "
"first."
msgstr ""
#: ../../../_source/toolchain.rst:124
#: ../../../_source/toolchain.rst:105
msgid ""
"For some reason, this is installing headers to ``/usr/hsa`` instead of ``/"
"opt/rocm``. It is ignoring the ``PREFIX``. Workaround..."
msgstr ""
#: ../../../_source/toolchain.rst:129
#: ../../../_source/toolchain.rst:110
msgid "comgr"
msgstr ""
#: ../../../_source/toolchain.rst:130
#: ../../../_source/toolchain.rst:111
msgid "Build ``comgr``."
msgstr ""
#: ../../../_source/toolchain.rst:132
#: ../../../_source/toolchain.rst:113
msgid ""
"Needs AMD device-libs built first. Needs hsa-runtime64Config.cmake first "
"from ROCR-Runtime"
msgstr ""
#: ../../../_source/toolchain.rst:140
#: ../../../_source/toolchain.rst:121
msgid "clr"
msgstr ""
#: ../../../_source/toolchain.rst:141
msgid "clr..."
#: ../../../_source/toolchain.rst:122
msgid "OpenCL and more."
msgstr ""
#: ../../../_source/toolchain.rst:149
#: ../../../_source/toolchain.rst:129
msgid "hipcc"
msgstr ""
#: ../../../_source/toolchain.rst:130
msgid "hipcc built under clr. This seems better."
msgstr ""
#: ../../../_source/toolchain.rst:156
#: ../../../_source/toolchain.rst:137
msgid "rocminfo"
msgstr ""
#: ../../../_source/toolchain.rst:157
#: ../../../_source/toolchain.rst:138
msgid "Yes, ``rocminfo``"
msgstr ""
#: ../../../_source/toolchain.rst:164
#: ../../../_source/toolchain.rst:145
msgid "rocBLAS"
msgstr ""
#: ../../../_source/toolchain.rst:165
#: ../../../_source/toolchain.rst:146
msgid "Needed before hipBLAS."
msgstr ""
#: ../../../_source/toolchain.rst:167
#: ../../../_source/toolchain.rst:148
msgid "Set up this once:"
msgstr ""
#: ../../../_source/toolchain.rst:184
#: ../../../_source/toolchain.rst:165
msgid "rocprim"
msgstr ""
#: ../../../_source/toolchain.rst:185
#: ../../../_source/toolchain.rst:166
msgid "``rocprim``."
msgstr ""
#: ../../../_source/toolchain.rst:192
#: ../../../_source/toolchain.rst:173
msgid "rocsparse"
msgstr ""
#: ../../../_source/toolchain.rst:193
#: ../../../_source/toolchain.rst:174
msgid "``rocsparse``."
msgstr ""
#: ../../../_source/toolchain.rst:200
#: ../../../_source/toolchain.rst:181
msgid "rocsolver"
msgstr ""
#: ../../../_source/toolchain.rst:201
#: ../../../_source/toolchain.rst:182
msgid "``rocsolver`` for hipBLAS."
msgstr ""
#: ../../../_source/toolchain.rst:208
#: ../../../_source/toolchain.rst:189
msgid "hipBLAS"
msgstr ""
#: ../../../_source/toolchain.rst:209
#: ../../../_source/toolchain.rst:190
msgid "``hipBLAS`` plz."
msgstr ""
#: ../../../_source/toolchain.rst:216
#: ../../../_source/toolchain.rst:197
msgid "rocm-bandwidth-test"
msgstr ""
#: ../../../_source/toolchain.rst:217
#: ../../../_source/toolchain.rst:198
msgid "``rocm-bandwidth-test``."
msgstr ""
#: ../../../_source/toolchain.rst:219
msgid "Needs hsa hsa.h: No such file or directory"
msgstr ""

View File

@ -47,7 +47,6 @@ rocm-core
---------
Build ``rocm-core``.
.. literalinclude:: _static/scripts/rocm-head/build-rocm-core.sh
:language: bash
@ -56,7 +55,6 @@ rocm-cmake
----------
Build ``rocm-cmake``.
.. literalinclude:: _static/scripts/rocm-head/build-rocm-cmake.sh
:language: bash
@ -65,11 +63,9 @@ amd-smi
-------
Build ``amd-smi``.
.. literalinclude:: _static/scripts/rocm-head/build-amd-smi.sh
:language: bash
After LLVM is built above, and the other packages, in particular
``rocm-core``, perhaps ``device-libs`` can be built.
In this build, the ``device-libs`` being used is the one in AMD's LLVM
@ -82,22 +78,10 @@ fork, it isn't AMD's separate repo for device libs.
* ``amd/comgr`` --- Code Object Manager.
hipcc
-----
Build ``hipcc``.
XXX This is better below using ``clr`` repo. XXX ?
.. literalinclude:: _static/scripts/rocm-head/build-hipcc.sh
:language: bash
device-libs
-----------
Build ``device-libs``.
Fails with clang target error...
.. literalinclude:: _static/scripts/rocm-head/build-device-libs.sh
:language: bash
@ -106,7 +90,6 @@ roct-thunk-interface
--------------------
Build ``roct-thunk-interface``.
.. literalinclude:: _static/scripts/rocm-head/build-roct-thunk-interface.sh
:language: bash
@ -116,11 +99,9 @@ rocr-runtime
Build ``rocr-runtime``.
Needs hsakmtConfig.cmake from ROCT-Thunk-Interface first.
.. literalinclude:: _static/scripts/rocm-head/build-rocr-runtime.sh
:language: bash
For some reason, this is installing headers to ``/usr/hsa`` instead of
``/opt/rocm``. It is ignoring the ``PREFIX``. Workaround...
@ -138,7 +119,7 @@ Needs hsa-runtime64Config.cmake first from ROCR-Runtime
clr
---
clr...
OpenCL and more.
.. literalinclude:: _static/scripts/rocm-head/build-clr.sh
:language: bash
@ -216,9 +197,6 @@ rocm-bandwidth-test
-------------------
``rocm-bandwidth-test``.
Needs hsa hsa.h: No such file or directory
.. literalinclude:: _static/scripts/rocm-head/build-rocm-bandwidth-test.sh
:language: bash