Merge pull request #22 from tinygrad/hip_6

update HIP to 6.0.0 and add ext

.github/workflows/test.yml

@@ -39,10 +39,8 @@ jobs:
       - name: Install HIP
         if: ${{ matrix.task == 'hip' }}
         run: |
-          sudo mkdir --parents --mode=0755 /etc/apt/keyrings
-          wget https://repo.radeon.com/rocm/rocm.gpg.key -O - | gpg --dearmor | sudo tee /etc/apt/keyrings/rocm.gpg > /dev/null
-          echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/5.7.1 jammy main" | sudo tee --append /etc/apt/sources.list.d/rocm.list
-          echo -e 'Package: *\nPin: release o=repo.radeon.com\nPin-Priority: 600' | sudo tee /etc/apt/preferences.d/rocm-pin-600
+          wget https://repo.radeon.com/amdgpu-install/6.0/ubuntu/jammy/amdgpu-install_6.0.60000-1_all.deb
+          sudo apt install ./amdgpu-install_6.0.60000-1_all.deb
           sudo apt update -y
           sudo apt install -y --no-install-recommends rocm-hip-sdk
       - name: Install CUDA

generate_hip.sh

@@ -1,8 +1,17 @@
 #!/bin/bash -e
-clang2py /opt/rocm/include/hip/hiprtc.h /opt/rocm/include/hip/hip_runtime_api.h /opt/rocm/include/hip/driver_types.h --clang-args="-D__HIP_PLATFORM_AMD__ -I/opt/rocm/include" -o gpuctypes/hip.py -l /opt/rocm/lib/libhiprtc.so -l /opt/rocm/lib/libamdhip64.so
+clang2py /opt/rocm/include/hip/hip_ext.h /opt/rocm/include/hip/hiprtc.h \
+  /opt/rocm/include/hip/hip_runtime_api.h /opt/rocm/include/hip/driver_types.h \
+  --clang-args="-D__HIP_PLATFORM_AMD__ -I/opt/rocm/include -x c++" -o gpuctypes/hip.py -l /opt/rocm/lib/libamdhip64.so
+echo "hipDeviceProp_t = hipDeviceProp_tR0600" >> gpuctypes/hip.py
+echo "hipGetDeviceProperties = hipGetDevicePropertiesR0600" >> gpuctypes/hip.py
 grep FIXME_STUB gpuctypes/hip.py || true
 # we can trust HIP is always at /opt/rocm/lib
 #sed -i "s\import ctypes\import ctypes, ctypes.util\g" gpuctypes/hip.py
 #sed -i "s\ctypes.CDLL('/opt/rocm/lib/libhiprtc.so')\ctypes.CDLL(ctypes.util.find_library('hiprtc'))\g" gpuctypes/hip.py
 #sed -i "s\ctypes.CDLL('/opt/rocm/lib/libamdhip64.so')\ctypes.CDLL(ctypes.util.find_library('amdhip64'))\g" gpuctypes/hip.py
 python3 -c "import gpuctypes.hip"
+
+clang2py /opt/rocm/include/amd_comgr/amd_comgr.h \
+  --clang-args="-D__HIP_PLATFORM_AMD__ -I/opt/rocm/include -x c++" -o gpuctypes/comgr.py -l /opt/rocm/lib/libamd_comgr.so
+grep FIXME_STUB gpuctypes/comgr.py || true
+python3 -c "import gpuctypes.comgr"