From f645865a85919c0f4ab08cdca81fc8253b874c0e Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 2 Mar 2026 13:41:21 -0500 Subject: [PATCH 01/36] remove hardcoded makefiles and add workflow testing --- .github/workflows/build-rocm-examples-reusable.yml | 6 ++++++ HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile | 2 +- .../Programming-Patterns/histogram_atomics/Makefile | 2 +- .../Programming-Patterns/image_convolution/Makefile | 2 +- HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile | 2 +- .../Programming-Patterns/matrix_multiplication/Makefile | 2 +- Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile | 2 +- Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile | 2 +- Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile | 2 +- .../MIGraphX/migraphx/custom_op_miopen_kernel/Makefile | 2 +- .../MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile | 2 +- Libraries/MIGraphX/vision/cpp_mnist/Makefile | 2 +- Libraries/MIVisionX/canny/Makefile | 2 +- Libraries/MIVisionX/mv_objdetect/Makefile | 2 +- Libraries/MIVisionX/opencv_orb/Makefile | 2 +- Libraries/RCCL/allgather/Makefile | 2 +- Libraries/RCCL/allreduce/Makefile | 2 +- Libraries/RCCL/broadcast/Makefile | 2 +- Libraries/RCCL/buffer_registration/Makefile | 2 +- Libraries/RCCL/device_api/Makefile | 2 +- Libraries/RCCL/gradient_allreduce/Makefile | 2 +- Libraries/RCCL/reduce/Makefile | 2 +- Libraries/RCCL/reducescatter/Makefile | 2 +- Libraries/RCCL/send_recv/Makefile | 2 +- Libraries/RPP/box_filter/Makefile | 2 +- Libraries/RPP/brightness/Makefile | 2 +- Libraries/RPP/contrast/Makefile | 2 +- Libraries/RPP/flip/Makefile | 2 +- Libraries/RPP/gamma_correction/Makefile | 2 +- Libraries/RPP/resize/Makefile | 2 +- Libraries/hipBLASLt/gemm_clamp_bias/Makefile | 2 +- Libraries/rocAL/basic/Makefile | 2 +- Libraries/rocAL/dataloader/Makefile | 2 +- Libraries/rocAL/image_augmentation/Makefile | 2 +- Libraries/rocAL/video/Makefile | 2 +- Libraries/rocCV/bilateral_filter/Makefile | 2 +- Libraries/rocCV/bnd_box/Makefile | 2 +- Libraries/rocCV/center_crop/Makefile | 2 +- Libraries/rocCV/composite/Makefile | 2 +- Libraries/rocCV/copy_make_border/Makefile | 2 +- Libraries/rocCV/cropandresize/Makefile | 2 +- Libraries/rocCV/custom_crop/Makefile | 2 +- Libraries/rocCV/gamma_contrast/Makefile | 2 +- Libraries/rocCV/normalize/Makefile | 2 +- Libraries/rocCV/warp_perspective/Makefile | 2 +- Libraries/rocFFT/multi_gpu/Makefile | 2 +- Libraries/rocJPEG/rocjpeg_decode/Makefile | 2 +- Libraries/rocJPEG/rocjpeg_decode_batched/Makefile | 2 +- Libraries/rocJPEG/rocjpeg_decode_perf/Makefile | 2 +- Tools/ROCgdb/Makefile | 2 +- 50 files changed, 55 insertions(+), 49 deletions(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 47cdfdc8f..420728308 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -68,6 +68,7 @@ jobs: run: | ROCM_PATH=$(rocm-sdk path --root) echo "ROCM_PATH=${ROCM_PATH}" >> $GITHUB_ENV + echo "ROCM_INSTALL_DIR=${ROCM_PATH}" >> $GITHUB_ENV echo "HIP_PATH=${ROCM_PATH}" >> $GITHUB_ENV echo "HIP_PLATFORM=amd" >> $GITHUB_ENV echo "HIP_DEVICE_LIB_PATH=${ROCM_PATH}/lib/llvm/amdgcn/bitcode" >> $GITHUB_ENV @@ -98,6 +99,7 @@ jobs: run: | ROCM_PATH=/therock-tarball/install echo "ROCM_PATH=${ROCM_PATH}" >> $GITHUB_ENV + echo "ROCM_INSTALL_DIR=${ROCM_PATH}" >> $GITHUB_ENV echo "HIP_PATH=${ROCM_PATH}" >> $GITHUB_ENV echo "HIP_PLATFORM=amd" >> $GITHUB_ENV echo "HIP_DEVICE_LIB_PATH=${ROCM_PATH}/lib/llvm/amdgcn/bitcode" >> $GITHUB_ENV @@ -217,6 +219,10 @@ jobs: name: ctest-logs-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} path: build/Testing/Temporary/ + - name: Makefile build + run: | + make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" + - name: Clean the workspace if: always() run: find "$GITHUB_WORKSPACE" -mindepth 1 -delete diff --git a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile index 86c8d8249..fb703da93 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile @@ -25,7 +25,7 @@ GRAPHGEN := graphgen GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile index f18d30eaf..2c798735f 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_histogram_atomics GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile index 2501e7758..b893a9730 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_image_convolution GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile index 4b9de3379..be78ebad1 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_kmeans GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile index 184f6edf7..24224e9ce 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_matrix_multiply GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile b/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile index 5374a7e8a..021959694 100644 --- a/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile +++ b/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile b/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile index 1b1077bdc..3a9b2df10 100644 --- a/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile +++ b/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile b/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile index cb199d05a..0a6af2900 100644 --- a/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile +++ b/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile b/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile index ab9ae3dfc..e7de8040a 100644 --- a/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile +++ b/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile b/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile index e7e9abfc1..d57f4db00 100644 --- a/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile +++ b/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/vision/cpp_mnist/Makefile b/Libraries/MIGraphX/vision/cpp_mnist/Makefile index 817b1a4eb..e12fc8e77 100644 --- a/Libraries/MIGraphX/vision/cpp_mnist/Makefile +++ b/Libraries/MIGraphX/vision/cpp_mnist/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIVisionX/canny/Makefile b/Libraries/MIVisionX/canny/Makefile index 069228f79..2267b588a 100644 --- a/Libraries/MIVisionX/canny/Makefile +++ b/Libraries/MIVisionX/canny/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External # ROCm installation directory -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm # MIVisionX and OpenCV include directories MIVISIONX_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include/mivisionx diff --git a/Libraries/MIVisionX/mv_objdetect/Makefile b/Libraries/MIVisionX/mv_objdetect/Makefile index 7628119f0..cb22fdd89 100644 --- a/Libraries/MIVisionX/mv_objdetect/Makefile +++ b/Libraries/MIVisionX/mv_objdetect/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External # ROCm installation directory -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm # Batch size configuration (can be overridden: make BATCH_SIZE=4) BATCH_SIZE := 1 diff --git a/Libraries/MIVisionX/opencv_orb/Makefile b/Libraries/MIVisionX/opencv_orb/Makefile index 0b13afb67..2848d8280 100644 --- a/Libraries/MIVisionX/opencv_orb/Makefile +++ b/Libraries/MIVisionX/opencv_orb/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External # ROCm installation directory -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm # MIVisionX and OpenCV include directories MIVISIONX_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include/mivisionx diff --git a/Libraries/RCCL/allgather/Makefile b/Libraries/RCCL/allgather/Makefile index c87929fae..45f3f38b5 100644 --- a/Libraries/RCCL/allgather/Makefile +++ b/Libraries/RCCL/allgather/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/allreduce/Makefile b/Libraries/RCCL/allreduce/Makefile index 10af8260c..93b334289 100644 --- a/Libraries/RCCL/allreduce/Makefile +++ b/Libraries/RCCL/allreduce/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/broadcast/Makefile b/Libraries/RCCL/broadcast/Makefile index 8c84548ae..d4397b217 100644 --- a/Libraries/RCCL/broadcast/Makefile +++ b/Libraries/RCCL/broadcast/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/buffer_registration/Makefile b/Libraries/RCCL/buffer_registration/Makefile index 1f80328a7..fe82d4a1d 100644 --- a/Libraries/RCCL/buffer_registration/Makefile +++ b/Libraries/RCCL/buffer_registration/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/device_api/Makefile b/Libraries/RCCL/device_api/Makefile index b0041dff1..752a2e9bb 100644 --- a/Libraries/RCCL/device_api/Makefile +++ b/Libraries/RCCL/device_api/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/gradient_allreduce/Makefile b/Libraries/RCCL/gradient_allreduce/Makefile index 2b75db86c..1f8cce63e 100644 --- a/Libraries/RCCL/gradient_allreduce/Makefile +++ b/Libraries/RCCL/gradient_allreduce/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/reduce/Makefile b/Libraries/RCCL/reduce/Makefile index 51faf584f..56a40791f 100644 --- a/Libraries/RCCL/reduce/Makefile +++ b/Libraries/RCCL/reduce/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/reducescatter/Makefile b/Libraries/RCCL/reducescatter/Makefile index 223ec082c..8ce5af696 100644 --- a/Libraries/RCCL/reducescatter/Makefile +++ b/Libraries/RCCL/reducescatter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/send_recv/Makefile b/Libraries/RCCL/send_recv/Makefile index ced19fc22..2da563bb6 100644 --- a/Libraries/RCCL/send_recv/Makefile +++ b/Libraries/RCCL/send_recv/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/box_filter/Makefile b/Libraries/RPP/box_filter/Makefile index 28459a4e7..00fb5cc5e 100644 --- a/Libraries/RPP/box_filter/Makefile +++ b/Libraries/RPP/box_filter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/brightness/Makefile b/Libraries/RPP/brightness/Makefile index f651586d6..6f83583ea 100644 --- a/Libraries/RPP/brightness/Makefile +++ b/Libraries/RPP/brightness/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/contrast/Makefile b/Libraries/RPP/contrast/Makefile index bab22245e..d277922f6 100644 --- a/Libraries/RPP/contrast/Makefile +++ b/Libraries/RPP/contrast/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/flip/Makefile b/Libraries/RPP/flip/Makefile index a198138bf..3f51cfdd9 100644 --- a/Libraries/RPP/flip/Makefile +++ b/Libraries/RPP/flip/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/gamma_correction/Makefile b/Libraries/RPP/gamma_correction/Makefile index b1f31b40e..a7ac06eb6 100644 --- a/Libraries/RPP/gamma_correction/Makefile +++ b/Libraries/RPP/gamma_correction/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/resize/Makefile b/Libraries/RPP/resize/Makefile index 038e59a33..19d2a68d1 100644 --- a/Libraries/RPP/resize/Makefile +++ b/Libraries/RPP/resize/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_clamp_bias/Makefile b/Libraries/hipBLASLt/gemm_clamp_bias/Makefile index b680902ac..6d966918c 100644 --- a/Libraries/hipBLASLt/gemm_clamp_bias/Makefile +++ b/Libraries/hipBLASLt/gemm_clamp_bias/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocAL/basic/Makefile b/Libraries/rocAL/basic/Makefile index d20a6d115..1a811b629 100644 --- a/Libraries/rocAL/basic/Makefile +++ b/Libraries/rocAL/basic/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocAL/dataloader/Makefile b/Libraries/rocAL/dataloader/Makefile index 75c743101..f9104cbae 100644 --- a/Libraries/rocAL/dataloader/Makefile +++ b/Libraries/rocAL/dataloader/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocAL/image_augmentation/Makefile b/Libraries/rocAL/image_augmentation/Makefile index 08e847d0b..063b6099c 100644 --- a/Libraries/rocAL/image_augmentation/Makefile +++ b/Libraries/rocAL/image_augmentation/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocAL/video/Makefile b/Libraries/rocAL/video/Makefile index 414b0dad6..c29a454dd 100644 --- a/Libraries/rocAL/video/Makefile +++ b/Libraries/rocAL/video/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocCV/bilateral_filter/Makefile b/Libraries/rocCV/bilateral_filter/Makefile index 172db1c79..16b0521d3 100644 --- a/Libraries/rocCV/bilateral_filter/Makefile +++ b/Libraries/rocCV/bilateral_filter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/bnd_box/Makefile b/Libraries/rocCV/bnd_box/Makefile index 8c5fddb1f..69ff742c8 100644 --- a/Libraries/rocCV/bnd_box/Makefile +++ b/Libraries/rocCV/bnd_box/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/center_crop/Makefile b/Libraries/rocCV/center_crop/Makefile index 4f0e411ac..45da94da3 100644 --- a/Libraries/rocCV/center_crop/Makefile +++ b/Libraries/rocCV/center_crop/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/composite/Makefile b/Libraries/rocCV/composite/Makefile index d740fbbc2..69184cc88 100644 --- a/Libraries/rocCV/composite/Makefile +++ b/Libraries/rocCV/composite/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/copy_make_border/Makefile b/Libraries/rocCV/copy_make_border/Makefile index 96b4a2aba..0f3f204b9 100644 --- a/Libraries/rocCV/copy_make_border/Makefile +++ b/Libraries/rocCV/copy_make_border/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/cropandresize/Makefile b/Libraries/rocCV/cropandresize/Makefile index 8e319c98e..3aa2c7d32 100644 --- a/Libraries/rocCV/cropandresize/Makefile +++ b/Libraries/rocCV/cropandresize/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/custom_crop/Makefile b/Libraries/rocCV/custom_crop/Makefile index ff36c725a..e4a1ec24e 100644 --- a/Libraries/rocCV/custom_crop/Makefile +++ b/Libraries/rocCV/custom_crop/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/gamma_contrast/Makefile b/Libraries/rocCV/gamma_contrast/Makefile index de414254d..c48a948da 100644 --- a/Libraries/rocCV/gamma_contrast/Makefile +++ b/Libraries/rocCV/gamma_contrast/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/normalize/Makefile b/Libraries/rocCV/normalize/Makefile index 0a0fd4d68..70f026690 100644 --- a/Libraries/rocCV/normalize/Makefile +++ b/Libraries/rocCV/normalize/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/warp_perspective/Makefile b/Libraries/rocCV/warp_perspective/Makefile index 25779d31a..542997824 100644 --- a/Libraries/rocCV/warp_perspective/Makefile +++ b/Libraries/rocCV/warp_perspective/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocFFT/multi_gpu/Makefile b/Libraries/rocFFT/multi_gpu/Makefile index bf914cc84..d2fe816af 100644 --- a/Libraries/rocFFT/multi_gpu/Makefile +++ b/Libraries/rocFFT/multi_gpu/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocJPEG/rocjpeg_decode/Makefile b/Libraries/rocJPEG/rocjpeg_decode/Makefile index 1e2b5eef4..f6af66a8f 100644 --- a/Libraries/rocJPEG/rocjpeg_decode/Makefile +++ b/Libraries/rocJPEG/rocjpeg_decode/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCJPEG_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile b/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile index 4c1143bf0..7a45a90f3 100644 --- a/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile +++ b/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCJPEG_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile b/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile index b16f075de..11e10f58c 100644 --- a/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile +++ b/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCJPEG_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Tools/ROCgdb/Makefile b/Tools/ROCgdb/Makefile index 1c27483ca..2d725b73b 100644 --- a/Tools/ROCgdb/Makefile +++ b/Tools/ROCgdb/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR := /opt/rocm +ROCM_INSTALL_DIR ?= /opt/rocm HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc From 70cfcedb1ea4ce7f0cea34e73216a81ccd070c9b Mon Sep 17 00:00:00 2001 From: zichguan-amd Date: Tue, 3 Feb 2026 10:53:45 -0500 Subject: [PATCH 02/36] Disable MIVisionX OpenCV example Signed-off-by: zichguan-amd (cherry picked from commit b185e37f25d9ab33cdbf97ea634948ac475dfe52) --- Libraries/MIVisionX/CMakeLists.txt | 6 +++++- Libraries/MIVisionX/Makefile | 4 ++-- Libraries/MIVisionX/opencv_orb/README.md | 3 +++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Libraries/MIVisionX/CMakeLists.txt b/Libraries/MIVisionX/CMakeLists.txt index 4b453b852..eb8ebb3e5 100644 --- a/Libraries/MIVisionX/CMakeLists.txt +++ b/Libraries/MIVisionX/CMakeLists.txt @@ -58,4 +58,8 @@ endif() add_subdirectory(canny) # Disable this test until Jira ticket ROCM-1771 is resolved #add_subdirectory(mv_objdetect) -add_subdirectory(opencv_orb) + +# OpenCV support will be removed in future releases +# this example will only work on ubuntu 22.04 with MIVisionX built from source with OpenCV support +# see https://github.com/ROCm/MIVisionX/pull/1575 +# add_subdirectory(opencv_orb) diff --git a/Libraries/MIVisionX/Makefile b/Libraries/MIVisionX/Makefile index a71666407..127284ef8 100644 --- a/Libraries/MIVisionX/Makefile +++ b/Libraries/MIVisionX/Makefile @@ -22,8 +22,8 @@ EXAMPLES := \ canny \ - mv_objdetect \ - opencv_orb + mv_objdetect +# opencv_orb all: $(EXAMPLES) diff --git a/Libraries/MIVisionX/opencv_orb/README.md b/Libraries/MIVisionX/opencv_orb/README.md index 108ada727..7b419c363 100644 --- a/Libraries/MIVisionX/opencv_orb/README.md +++ b/Libraries/MIVisionX/opencv_orb/README.md @@ -1,5 +1,8 @@ # MIVisionX ORB Feature Detection +> [!WARNING] +> This example is deprecated. OpenCV support from MIVisionX will be removed in future releases, this example will only work on Ubuntu 22.04 with MIVisionX built from source with OpenCV support. For more details on how to build MIVisionX, please see https://github.com/ROCm/MIVisionX and https://github.com/ROCm/MIVisionX/pull/1575 + ## Description This example demonstrates ORB (Oriented FAST and Rotated BRIEF) feature detection using OpenVX with OpenCV extensions. The example processes images or live camera feeds to detect and extract keypoint features, which are useful for object recognition, image matching, and tracking applications. From 4a471ca9c2afcea540616f4cd5ea4e4df62e401a Mon Sep 17 00:00:00 2001 From: Claude Date: Fri, 6 Mar 2026 21:30:25 +0000 Subject: [PATCH 03/36] Fix Makefile build step: correct GPU arch flag and add cancelled guard - Replace HIP_ARCHITECTURES (unused by individual example Makefiles) with CXXFLAGS="--offload-arch=..." which is how hipcc receives the target arch - Add if: cancelled guard so Makefile build runs even when ctest fails, preventing test failures from masking Makefile build results Co-Authored-By: Claude Opus 4.6 --- .github/workflows/build-rocm-examples-reusable.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 420728308..e78b86ea4 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -220,8 +220,9 @@ jobs: path: build/Testing/Temporary/ - name: Makefile build + if: ${{ !cancelled() }} run: | - make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" + make -j ROCM_INSTALL_DIR="${ROCM_PATH}" CXXFLAGS="--offload-arch=${{ matrix.gpu_config.gpu_target }}" - name: Clean the workspace if: always() From 36dc947ce562c986fac679338c8c2e739f9fbd9e Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 10 Mar 2026 15:43:02 +0000 Subject: [PATCH 04/36] Use ROCM_PATH env variable for Makefile ROCm install directory Replace hardcoded `ROCM_INSTALL_DIR ?= /opt/rocm` with `ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm)` across all 378 leaf Makefiles. This allows TheRock CI to set ROCM_PATH in the environment while preserving /opt/rocm as the default fallback. Co-Authored-By: Claude Opus 4.6 --- Applications/bitonic_sort/Makefile | 2 +- Applications/convolution/Makefile | 2 +- Applications/fdtd/Makefile | 2 +- Applications/floyd_warshall/Makefile | 2 +- Applications/histogram/Makefile | 2 +- Applications/monte_carlo_pi/Makefile | 2 +- Applications/prefix_sum/Makefile | 2 +- Applications/sobel_filter/Makefile | 2 +- HIP-Basic/assembly_to_executable/Makefile | 2 +- HIP-Basic/bandwidth/Makefile | 2 +- HIP-Basic/bit_extract/Makefile | 2 +- HIP-Basic/cooperative_groups/Makefile | 2 +- HIP-Basic/device_globals/Makefile | 2 +- HIP-Basic/device_query/Makefile | 2 +- HIP-Basic/dynamic_shared/Makefile | 2 +- HIP-Basic/events/Makefile | 2 +- HIP-Basic/gpu_arch/Makefile | 2 +- HIP-Basic/hello_world/Makefile | 2 +- HIP-Basic/hipify/Makefile | 2 +- HIP-Basic/inline_assembly/Makefile | 2 +- HIP-Basic/llvm_ir_to_executable/Makefile | 2 +- HIP-Basic/matrix_multiplication/Makefile | 2 +- HIP-Basic/module_api/Makefile | 2 +- HIP-Basic/moving_average/Makefile | 2 +- HIP-Basic/multi_gpu_data_transfer/Makefile | 2 +- HIP-Basic/occupancy/Makefile | 2 +- HIP-Basic/opengl_interop/Makefile | 2 +- HIP-Basic/runtime_compilation/Makefile | 2 +- HIP-Basic/saxpy/Makefile | 2 +- HIP-Basic/shared_memory/Makefile | 2 +- HIP-Basic/static_device_library/Makefile | 2 +- HIP-Basic/static_host_library/Makefile | 2 +- HIP-Basic/streams/Makefile | 2 +- HIP-Basic/texture_management/Makefile | 2 +- HIP-Basic/vulkan_interop/Makefile | 2 +- HIP-Basic/warp_shuffle/Makefile | 2 +- .../calling_global_functions/Makefile | 2 +- .../HIP-C++-Language-Extensions/extern_shared_memory/Makefile | 2 +- .../HIP-C++-Language-Extensions/launch_bounds/Makefile | 2 +- .../HIP-C++-Language-Extensions/set_constant_memory/Makefile | 2 +- .../template_warp_size_reduction/Makefile | 2 +- .../HIP-C++-Language-Extensions/timer/Makefile | 2 +- .../HIP-C++-Language-Extensions/warp_size_reduction/Makefile | 2 +- .../add_kernel/Makefile | 2 +- .../Porting-CUDA-code-to-HIP/address_retrieval/Makefile | 2 +- .../device_code_feature_identification/Makefile | 2 +- .../host_code_feature_identification/Makefile | 2 +- .../identifying_compilation_target_platform/Makefile | 2 +- .../identifying_host_device_compilation_pass/Makefile | 2 +- .../Porting-CUDA-code-to-HIP/load_module/Makefile | 2 +- .../Porting-CUDA-code-to-HIP/load_module_ex/Makefile | 2 +- .../Porting-CUDA-code-to-HIP/load_module_ex_cuda/Makefile | 2 +- .../Porting-CUDA-code-to-HIP/per_thread_default_stream/Makefile | 2 +- .../Porting-CUDA-code-to-HIP/pointer_memory_type/Makefile | 2 +- .../compilation_apis/Makefile | 2 +- .../Programming-for-HIP-Runtime-Compiler/linker_apis/Makefile | 2 +- .../linker_apis_file/Makefile | 2 +- .../linker_apis_options/Makefile | 2 +- .../Programming-for-HIP-Runtime-Compiler/lowered_names/Makefile | 2 +- .../rtc_error_handling/Makefile | 2 +- .../async_kernel_execution/Makefile | 2 +- .../event_based_synchronization/Makefile | 2 +- .../sequential_kernel_execution/Makefile | 2 +- .../Call-Stack/call_stack_management/Makefile | 2 +- .../Using-HIP-Runtime-API/Call-Stack/device_recursion/Makefile | 2 +- .../Error-Handling/error_handling/Makefile | 2 +- .../Using-HIP-Runtime-API/HIP-Graphs/graph_capture/Makefile | 2 +- .../Using-HIP-Runtime-API/HIP-Graphs/graph_creation/Makefile | 2 +- .../Initialization/simple_device_query/Makefile | 2 +- .../Memory-Management/Device-Memory/constant_memory/Makefile | 2 +- .../Device-Memory/dynamic_shared_memory/Makefile | 2 +- .../Memory-Management/Device-Memory/explicit_copy/Makefile | 2 +- .../Device-Memory/kernel_memory_allocation/Makefile | 2 +- .../Device-Memory/static_shared_memory/Makefile | 2 +- .../Memory-Management/Host-Memory/pageable_host_memory/Makefile | 2 +- .../Memory-Management/Host-Memory/pinned_host_memory/Makefile | 2 +- .../Memory-Management/SOMA/memory_pool/Makefile | 2 +- .../SOMA/memory_pool_resource_usage_statistics/Makefile | 2 +- .../Memory-Management/SOMA/memory_pool_threshold/Makefile | 2 +- .../Memory-Management/SOMA/memory_pool_trim/Makefile | 2 +- .../Memory-Management/SOMA/ordinary_memory_allocation/Makefile | 2 +- .../SOMA/stream_ordered_memory_allocation/Makefile | 2 +- .../Unified-Memory-Management/data_prefetching/Makefile | 2 +- .../Unified-Memory-Management/dynamic_unified_memory/Makefile | 2 +- .../Unified-Memory-Management/explicit_memory/Makefile | 2 +- .../Unified-Memory-Management/memory_range_attributes/Makefile | 2 +- .../Unified-Memory-Management/standard_unified_memory/Makefile | 2 +- .../Unified-Memory-Management/static_unified_memory/Makefile | 2 +- .../Unified-Memory-Management/unified_memory_advice/Makefile | 2 +- .../Virtual-Memory-Management/virtual_memory/Makefile | 2 +- .../Multi-Device-Management/device_enumeration/Makefile | 2 +- .../Multi-Device-Management/device_selection/Makefile | 2 +- .../multi_device_synchronization/Makefile | 2 +- .../Multi-Device-Management/p2p_memory_access/Makefile | 2 +- .../p2p_memory_access_host_staging/Makefile | 2 +- .../block_reduction/Makefile | 2 +- HIP-Doc/Reference/HIP-Complex-Math-API/complex_math/Makefile | 2 +- HIP-Doc/Reference/HIP-Math-API/math/Makefile | 2 +- .../low_precision_float_fp16/Makefile | 2 +- .../low_precision_float_fp8/Makefile | 2 +- HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile | 2 +- .../Tutorials/Programming-Patterns/histogram_atomics/Makefile | 2 +- .../Tutorials/Programming-Patterns/image_convolution/Makefile | 2 +- HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile | 2 +- .../Programming-Patterns/matrix_multiplication/Makefile | 2 +- Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile | 2 +- Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile | 2 +- Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile | 2 +- Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile | 2 +- Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile | 2 +- Libraries/MIGraphX/vision/cpp_mnist/Makefile | 2 +- Libraries/MIVisionX/canny/Makefile | 2 +- Libraries/MIVisionX/mv_objdetect/Makefile | 2 +- Libraries/MIVisionX/opencv_orb/Makefile | 2 +- Libraries/RCCL/allgather/Makefile | 2 +- Libraries/RCCL/allreduce/Makefile | 2 +- Libraries/RCCL/broadcast/Makefile | 2 +- Libraries/RCCL/buffer_registration/Makefile | 2 +- Libraries/RCCL/device_api/Makefile | 2 +- Libraries/RCCL/gradient_allreduce/Makefile | 2 +- Libraries/RCCL/reduce/Makefile | 2 +- Libraries/RCCL/reducescatter/Makefile | 2 +- Libraries/RCCL/send_recv/Makefile | 2 +- Libraries/RPP/box_filter/Makefile | 2 +- Libraries/RPP/brightness/Makefile | 2 +- Libraries/RPP/contrast/Makefile | 2 +- Libraries/RPP/flip/Makefile | 2 +- Libraries/RPP/gamma_correction/Makefile | 2 +- Libraries/RPP/resize/Makefile | 2 +- Libraries/hipBLAS/gemm_strided_batched/Makefile | 2 +- Libraries/hipBLAS/her/Makefile | 2 +- Libraries/hipBLAS/scal/Makefile | 2 +- Libraries/hipBLASLt/ext_op_amax/Makefile | 2 +- Libraries/hipBLASLt/ext_op_layernorm/Makefile | 2 +- Libraries/hipBLASLt/gemm/Makefile | 2 +- Libraries/hipBLASLt/gemm_alphavec_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_amax/Makefile | 2 +- Libraries/hipBLASLt/gemm_amax_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_amax_with_scale/Makefile | 2 +- Libraries/hipBLASLt/gemm_amax_with_scale_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_attr_tciA_tciB/Makefile | 2 +- Libraries/hipBLASLt/gemm_batched/Makefile | 2 +- Libraries/hipBLASLt/gemm_batched_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_bgradb/Makefile | 2 +- Libraries/hipBLASLt/gemm_bias/Makefile | 2 +- Libraries/hipBLASLt/gemm_bias_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_bias_swizzle_a_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_clamp_bias/Makefile | 2 +- Libraries/hipBLASLt/gemm_dgelu_bgradb/Makefile | 2 +- Libraries/hipBLASLt/gemm_dgelu_bgradb_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_ext_bgradb/Makefile | 2 +- Libraries/hipBLASLt/gemm_gelu_aux_bias/Makefile | 2 +- Libraries/hipBLASLt/gemm_gelu_aux_bias_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_get_algo_by_index_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_get_all_algos/Makefile | 2 +- Libraries/hipBLASLt/gemm_get_all_algos_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_is_tuned_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_mix_precision/Makefile | 2 +- Libraries/hipBLASLt/gemm_mix_precision_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_mix_precision_with_amax_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_swish_bias/Makefile | 2 +- Libraries/hipBLASLt/gemm_swizzle_a/Makefile | 2 +- Libraries/hipBLASLt/gemm_swizzle_b/Makefile | 2 +- Libraries/hipBLASLt/gemm_tuning_splitk_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_tuning_wgm_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_with_TF32/Makefile | 2 +- Libraries/hipBLASLt/gemm_with_scale_a_b/Makefile | 2 +- Libraries/hipBLASLt/gemm_with_scale_a_b_ext/Makefile | 2 +- Libraries/hipBLASLt/gemm_with_scale_a_b_vector/Makefile | 2 +- Libraries/hipBLASLt/groupedgemm_ext/Makefile | 2 +- Libraries/hipBLASLt/groupedgemm_fixed_mk_ext/Makefile | 2 +- Libraries/hipBLASLt/groupedgemm_get_all_algos_ext/Makefile | 2 +- Libraries/hipBLASLt/weight_swizzle_padding/Makefile | 2 +- Libraries/hipCUB/device_radix_sort/Makefile | 2 +- Libraries/hipCUB/device_sum/Makefile | 2 +- Libraries/hipFFT/callback/Makefile | 2 +- Libraries/hipFFT/multi_gpu/Makefile | 2 +- Libraries/hipFFT/plan_d2z/Makefile | 2 +- Libraries/hipFFT/plan_many_2d_r2c/Makefile | 2 +- Libraries/hipFFT/plan_many_2d_z2z/Makefile | 2 +- Libraries/hipFFT/plan_z2z/Makefile | 2 +- Libraries/hipFFT/setworkarea/Makefile | 2 +- Libraries/hipRAND/c_cpp_api/simple_distributions_cpp/Makefile | 2 +- Libraries/hipRAND/device_api/pseudorandom_generations/Makefile | 2 +- Libraries/hipRAND/device_api/quasirandom_generations/Makefile | 2 +- Libraries/hipSOLVER/gels/Makefile | 2 +- Libraries/hipSOLVER/geqrf/Makefile | 2 +- Libraries/hipSOLVER/gesvd/Makefile | 2 +- Libraries/hipSOLVER/getrf/Makefile | 2 +- Libraries/hipSOLVER/potrf/Makefile | 2 +- Libraries/hipSOLVER/syevd/Makefile | 2 +- Libraries/hipSOLVER/syevdx/Makefile | 2 +- Libraries/hipSOLVER/syevj/Makefile | 2 +- Libraries/hipSOLVER/syevj_batched/Makefile | 2 +- Libraries/hipSOLVER/sygvd/Makefile | 2 +- Libraries/hipSOLVER/sygvj/Makefile | 2 +- Libraries/hipSPARSE/axpyi/Makefile | 2 +- Libraries/hipSPARSE/csrmv/Makefile | 2 +- Libraries/hipSPARSE/handle/Makefile | 2 +- Libraries/hipSPARSE/hybmv/Makefile | 2 +- Libraries/hipSPARSELt/spmm/Makefile | 2 +- Libraries/hipSPARSELt/spmm_advanced/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/bf16_f32/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/cf32_cf32/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/f16_f32/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/f32_bf16/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/f32_f16/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/f32_f32/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/f64_f32/Makefile | 2 +- Libraries/hipTensor/contraction/bilinear/f64_f64/Makefile | 2 +- Libraries/hipTensor/contraction/scale/bf16_f32/Makefile | 2 +- Libraries/hipTensor/contraction/scale/cf32_cf32/Makefile | 2 +- Libraries/hipTensor/contraction/scale/f16_f32/Makefile | 2 +- Libraries/hipTensor/contraction/scale/f32_bf16/Makefile | 2 +- Libraries/hipTensor/contraction/scale/f32_f16/Makefile | 2 +- Libraries/hipTensor/contraction/scale/f32_f32/Makefile | 2 +- Libraries/hipTensor/contraction/scale/f64_f32/Makefile | 2 +- Libraries/hipTensor/contraction/scale/f64_f64/Makefile | 2 +- Libraries/hipTensor/elementwise/binary/Makefile | 2 +- Libraries/hipTensor/elementwise/permute/Makefile | 2 +- Libraries/hipTensor/elementwise/trinary/Makefile | 2 +- Libraries/hipTensor/reduction/Makefile | 2 +- Libraries/rocAL/basic/Makefile | 2 +- Libraries/rocAL/dataloader/Makefile | 2 +- Libraries/rocAL/image_augmentation/Makefile | 2 +- Libraries/rocAL/video/Makefile | 2 +- Libraries/rocALUTION/amg/Makefile | 2 +- Libraries/rocALUTION/as_precond/Makefile | 2 +- Libraries/rocALUTION/async/Makefile | 2 +- Libraries/rocALUTION/benchmark/Makefile | 2 +- Libraries/rocALUTION/bicgstab/Makefile | 2 +- Libraries/rocALUTION/block_precond/Makefile | 2 +- Libraries/rocALUTION/cg/Makefile | 2 +- Libraries/rocALUTION/cg_amg/Makefile | 2 +- Libraries/rocALUTION/cg_rsamg/Makefile | 2 +- Libraries/rocALUTION/cg_saamg/Makefile | 2 +- Libraries/rocALUTION/cmk/Makefile | 2 +- Libraries/rocALUTION/complex/Makefile | 2 +- Libraries/rocALUTION/direct/Makefile | 2 +- Libraries/rocALUTION/fcg/Makefile | 2 +- Libraries/rocALUTION/fgmres/Makefile | 2 +- Libraries/rocALUTION/fixed_point/Makefile | 2 +- Libraries/rocALUTION/gmres/Makefile | 2 +- Libraries/rocALUTION/idr/Makefile | 2 +- Libraries/rocALUTION/itsolve/Makefile | 2 +- Libraries/rocALUTION/key/Makefile | 2 +- Libraries/rocALUTION/me_preconditioner/Makefile | 2 +- Libraries/rocALUTION/mixed_precision/Makefile | 2 +- Libraries/rocALUTION/power_method/Makefile | 2 +- Libraries/rocALUTION/sa_amg/Makefile | 2 +- Libraries/rocALUTION/simple_spmv/Makefile | 2 +- Libraries/rocALUTION/stencil/Makefile | 2 +- Libraries/rocALUTION/tns/Makefile | 2 +- Libraries/rocALUTION/ua_amg/Makefile | 2 +- Libraries/rocALUTION/var_precond/Makefile | 2 +- Libraries/rocBLAS/level_1/axpy/Makefile | 2 +- Libraries/rocBLAS/level_1/dot/Makefile | 2 +- Libraries/rocBLAS/level_1/nrm2/Makefile | 2 +- Libraries/rocBLAS/level_1/scal/Makefile | 2 +- Libraries/rocBLAS/level_1/swap/Makefile | 2 +- Libraries/rocBLAS/level_2/gemv/Makefile | 2 +- Libraries/rocBLAS/level_2/her/Makefile | 2 +- Libraries/rocBLAS/level_3/gemm/Makefile | 2 +- Libraries/rocBLAS/level_3/gemm_strided_batched/Makefile | 2 +- Libraries/rocCV/bilateral_filter/Makefile | 2 +- Libraries/rocCV/bnd_box/Makefile | 2 +- Libraries/rocCV/center_crop/Makefile | 2 +- Libraries/rocCV/composite/Makefile | 2 +- Libraries/rocCV/copy_make_border/Makefile | 2 +- Libraries/rocCV/cropandresize/Makefile | 2 +- Libraries/rocCV/custom_crop/Makefile | 2 +- Libraries/rocCV/gamma_contrast/Makefile | 2 +- Libraries/rocCV/normalize/Makefile | 2 +- Libraries/rocCV/warp_perspective/Makefile | 2 +- Libraries/rocDecode/rocdec_decode/Makefile | 2 +- Libraries/rocDecode/video_decode/Makefile | 2 +- Libraries/rocDecode/video_decode_batch/Makefile | 2 +- Libraries/rocDecode/video_decode_mem/Makefile | 2 +- Libraries/rocDecode/video_decode_multi_files/Makefile | 2 +- Libraries/rocDecode/video_decode_perf/Makefile | 2 +- Libraries/rocDecode/video_decode_pic_files/Makefile | 2 +- Libraries/rocDecode/video_decode_raw/Makefile | 2 +- Libraries/rocDecode/video_decode_rgb/Makefile | 2 +- Libraries/rocDecode/video_to_sequence/Makefile | 2 +- Libraries/rocFFT/Makefile | 2 +- Libraries/rocFFT/callback/Makefile | 2 +- Libraries/rocFFT/complex_complex/Makefile | 2 +- Libraries/rocFFT/complex_real/Makefile | 2 +- Libraries/rocFFT/multi_gpu/Makefile | 2 +- Libraries/rocFFT/real_complex/Makefile | 2 +- Libraries/rocJPEG/rocjpeg_decode/Makefile | 2 +- Libraries/rocJPEG/rocjpeg_decode_batched/Makefile | 2 +- Libraries/rocJPEG/rocjpeg_decode_perf/Makefile | 2 +- Libraries/rocPRIM/block_sum/Makefile | 2 +- Libraries/rocPRIM/device_sum/Makefile | 2 +- Libraries/rocProfiler-SDK/api_buffered_tracing/Makefile | 2 +- Libraries/rocProfiler-SDK/api_callback_tracing/Makefile | 2 +- Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile | 2 +- Libraries/rocProfiler-SDK/code_object_tracing/Makefile | 2 +- Libraries/rocProfiler-SDK/counter_collection/buffer/Makefile | 2 +- .../counter_collection/buffer_device_serialization/Makefile | 2 +- Libraries/rocProfiler-SDK/counter_collection/callback/Makefile | 2 +- .../counter_collection/device_profiling/Makefile | 2 +- .../counter_collection/device_profiling_sync/Makefile | 2 +- .../counter_collection/print_functional_counters/Makefile | 2 +- .../rocProfiler-SDK/external_correlation_id_request/Makefile | 2 +- Libraries/rocProfiler-SDK/intercept_table/Makefile | 2 +- Libraries/rocProfiler-SDK/openmp_target/Makefile | 2 +- Libraries/rocProfiler-SDK/pc_sampling/Makefile | 2 +- Libraries/rocProfiler-SDK/thread_trace/Makefile | 2 +- Libraries/rocRAND/c_cpp_api/simple_distributions_cpp/Makefile | 2 +- Libraries/rocRAND/device_api/pseudorandom_generations/Makefile | 2 +- Libraries/rocRAND/device_api/quasirandom_generations/Makefile | 2 +- Libraries/rocSOLVER/getf2/Makefile | 2 +- Libraries/rocSOLVER/getri/Makefile | 2 +- Libraries/rocSOLVER/syev/Makefile | 2 +- Libraries/rocSOLVER/syev_batched/Makefile | 2 +- Libraries/rocSOLVER/syev_strided_batched/Makefile | 2 +- Libraries/rocSPARSE/level_1/axpyi/Makefile | 2 +- Libraries/rocSPARSE/level_1/doti/Makefile | 2 +- Libraries/rocSPARSE/level_1/gthr/Makefile | 2 +- Libraries/rocSPARSE/level_1/roti/Makefile | 2 +- Libraries/rocSPARSE/level_1/sctr/Makefile | 2 +- Libraries/rocSPARSE/level_2/bsrmv/Makefile | 2 +- Libraries/rocSPARSE/level_2/bsrsv/Makefile | 2 +- Libraries/rocSPARSE/level_2/bsrxmv/Makefile | 2 +- Libraries/rocSPARSE/level_2/coomv/Makefile | 2 +- Libraries/rocSPARSE/level_2/csritsv/Makefile | 2 +- Libraries/rocSPARSE/level_2/csrmv/Makefile | 2 +- Libraries/rocSPARSE/level_2/csrsv/Makefile | 2 +- Libraries/rocSPARSE/level_2/ellmv/Makefile | 2 +- Libraries/rocSPARSE/level_2/gebsrmv/Makefile | 2 +- Libraries/rocSPARSE/level_2/gemvi/Makefile | 2 +- Libraries/rocSPARSE/level_2/spitsv/Makefile | 2 +- Libraries/rocSPARSE/level_2/spmv/Makefile | 2 +- Libraries/rocSPARSE/level_2/spsv/Makefile | 2 +- Libraries/rocSPARSE/level_3/bsrmm/Makefile | 2 +- Libraries/rocSPARSE/level_3/bsrsm/Makefile | 2 +- Libraries/rocSPARSE/level_3/csrmm/Makefile | 2 +- Libraries/rocSPARSE/level_3/csrsm/Makefile | 2 +- Libraries/rocSPARSE/level_3/gebsrmm/Makefile | 2 +- Libraries/rocSPARSE/level_3/gemmi/Makefile | 2 +- Libraries/rocSPARSE/level_3/sddmm/Makefile | 2 +- Libraries/rocSPARSE/level_3/spmm/Makefile | 2 +- Libraries/rocSPARSE/level_3/spsm/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/bsric0/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/bsrilu0/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/csric0/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/csrilu0/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/csritilu0/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/gpsv/Makefile | 2 +- Libraries/rocSPARSE/preconditioner/gtsv/Makefile | 2 +- Libraries/rocThrust/device_ptr/Makefile | 2 +- Libraries/rocThrust/norm/Makefile | 2 +- Libraries/rocThrust/reduce_sum/Makefile | 2 +- Libraries/rocThrust/remove_points/Makefile | 2 +- Libraries/rocThrust/saxpy/Makefile | 2 +- Libraries/rocThrust/vectors/Makefile | 2 +- Libraries/rocWMMA/hiprtc_gemm/Makefile | 2 +- Libraries/rocWMMA/perf_dgemm/Makefile | 2 +- Libraries/rocWMMA/perf_hgemm/Makefile | 2 +- Libraries/rocWMMA/perf_i8gemm/Makefile | 2 +- Libraries/rocWMMA/perf_sgemm/Makefile | 2 +- Libraries/rocWMMA/simple_dgemm/Makefile | 2 +- Libraries/rocWMMA/simple_dgemv/Makefile | 2 +- Libraries/rocWMMA/simple_dlrm/Makefile | 2 +- Libraries/rocWMMA/simple_hgemm/Makefile | 2 +- Libraries/rocWMMA/simple_sgemm/Makefile | 2 +- Libraries/rocWMMA/simple_sgemv/Makefile | 2 +- .../basic_image_gamma_correction/Makefile | 2 +- .../grid_stride_image_gamma_correction/Makefile | 2 +- .../Performance-Optimization/tiling_matrix_multiply/Makefile | 2 +- .../Performance-Optimization/tiling_matrix_transpose/Makefile | 2 +- Tools/ROCgdb/Makefile | 2 +- Tools/rocprof-compute/Makefile | 2 +- Tools/rocprof-systems/Makefile | 2 +- Tools/rocprofv3/Makefile | 2 +- 378 files changed, 378 insertions(+), 378 deletions(-) diff --git a/Applications/bitonic_sort/Makefile b/Applications/bitonic_sort/Makefile index bac31b5d6..555b1d4b4 100644 --- a/Applications/bitonic_sort/Makefile +++ b/Applications/bitonic_sort/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Applications/convolution/Makefile b/Applications/convolution/Makefile index 480e0e7c9..8f61002ba 100644 --- a/Applications/convolution/Makefile +++ b/Applications/convolution/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Applications/fdtd/Makefile b/Applications/fdtd/Makefile index da1e6c75d..357f48940 100644 --- a/Applications/fdtd/Makefile +++ b/Applications/fdtd/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Applications/floyd_warshall/Makefile b/Applications/floyd_warshall/Makefile index 4f31dc93b..53cd48bf0 100644 --- a/Applications/floyd_warshall/Makefile +++ b/Applications/floyd_warshall/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Applications/histogram/Makefile b/Applications/histogram/Makefile index 1db9adfb4..3db8867b8 100644 --- a/Applications/histogram/Makefile +++ b/Applications/histogram/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Applications/monte_carlo_pi/Makefile b/Applications/monte_carlo_pi/Makefile index eb259f86f..5ead86e0d 100644 --- a/Applications/monte_carlo_pi/Makefile +++ b/Applications/monte_carlo_pi/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Applications/prefix_sum/Makefile b/Applications/prefix_sum/Makefile index c5f200e68..eee1fbe12 100644 --- a/Applications/prefix_sum/Makefile +++ b/Applications/prefix_sum/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Applications/sobel_filter/Makefile b/Applications/sobel_filter/Makefile index a4ca5c0ca..0205fdb0e 100644 --- a/Applications/sobel_filter/Makefile +++ b/Applications/sobel_filter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/assembly_to_executable/Makefile b/HIP-Basic/assembly_to_executable/Makefile index 1b4b8a7c1..ce803aadd 100644 --- a/HIP-Basic/assembly_to_executable/Makefile +++ b/HIP-Basic/assembly_to_executable/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/bandwidth/Makefile b/HIP-Basic/bandwidth/Makefile index 46321e780..549512fa5 100644 --- a/HIP-Basic/bandwidth/Makefile +++ b/HIP-Basic/bandwidth/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/bit_extract/Makefile b/HIP-Basic/bit_extract/Makefile index 89570ca3a..ced26ab89 100644 --- a/HIP-Basic/bit_extract/Makefile +++ b/HIP-Basic/bit_extract/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/cooperative_groups/Makefile b/HIP-Basic/cooperative_groups/Makefile index 4b2634d3a..e7a9d3f9c 100644 --- a/HIP-Basic/cooperative_groups/Makefile +++ b/HIP-Basic/cooperative_groups/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/device_globals/Makefile b/HIP-Basic/device_globals/Makefile index 842f90817..bfedd8f38 100644 --- a/HIP-Basic/device_globals/Makefile +++ b/HIP-Basic/device_globals/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/device_query/Makefile b/HIP-Basic/device_query/Makefile index 2af0d59e5..408e4063c 100644 --- a/HIP-Basic/device_query/Makefile +++ b/HIP-Basic/device_query/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/dynamic_shared/Makefile b/HIP-Basic/dynamic_shared/Makefile index 267f33bba..9ea0a5736 100644 --- a/HIP-Basic/dynamic_shared/Makefile +++ b/HIP-Basic/dynamic_shared/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/events/Makefile b/HIP-Basic/events/Makefile index 934a566e1..aef65d01e 100644 --- a/HIP-Basic/events/Makefile +++ b/HIP-Basic/events/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/gpu_arch/Makefile b/HIP-Basic/gpu_arch/Makefile index c3017f5a1..7c7aeb83c 100644 --- a/HIP-Basic/gpu_arch/Makefile +++ b/HIP-Basic/gpu_arch/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/hello_world/Makefile b/HIP-Basic/hello_world/Makefile index 5e78036fc..26cd5ca0a 100644 --- a/HIP-Basic/hello_world/Makefile +++ b/HIP-Basic/hello_world/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/hipify/Makefile b/HIP-Basic/hipify/Makefile index ea61e62d8..ac5b01961 100644 --- a/HIP-Basic/hipify/Makefile +++ b/HIP-Basic/hipify/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_hipify GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/inline_assembly/Makefile b/HIP-Basic/inline_assembly/Makefile index 6d03c4342..297dc042d 100644 --- a/HIP-Basic/inline_assembly/Makefile +++ b/HIP-Basic/inline_assembly/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/llvm_ir_to_executable/Makefile b/HIP-Basic/llvm_ir_to_executable/Makefile index 96914c46d..2ff02ba62 100644 --- a/HIP-Basic/llvm_ir_to_executable/Makefile +++ b/HIP-Basic/llvm_ir_to_executable/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/matrix_multiplication/Makefile b/HIP-Basic/matrix_multiplication/Makefile index 131e17691..251231bf1 100644 --- a/HIP-Basic/matrix_multiplication/Makefile +++ b/HIP-Basic/matrix_multiplication/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/module_api/Makefile b/HIP-Basic/module_api/Makefile index 6d0e3d685..4236dcb17 100644 --- a/HIP-Basic/module_api/Makefile +++ b/HIP-Basic/module_api/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/moving_average/Makefile b/HIP-Basic/moving_average/Makefile index 5b3ecdb51..6cc909f0f 100644 --- a/HIP-Basic/moving_average/Makefile +++ b/HIP-Basic/moving_average/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/multi_gpu_data_transfer/Makefile b/HIP-Basic/multi_gpu_data_transfer/Makefile index 197d9861e..1e0a911a6 100644 --- a/HIP-Basic/multi_gpu_data_transfer/Makefile +++ b/HIP-Basic/multi_gpu_data_transfer/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/occupancy/Makefile b/HIP-Basic/occupancy/Makefile index 864868841..932c994dc 100644 --- a/HIP-Basic/occupancy/Makefile +++ b/HIP-Basic/occupancy/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/opengl_interop/Makefile b/HIP-Basic/opengl_interop/Makefile index 1643f092b..a8a76681c 100644 --- a/HIP-Basic/opengl_interop/Makefile +++ b/HIP-Basic/opengl_interop/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/runtime_compilation/Makefile b/HIP-Basic/runtime_compilation/Makefile index 222bddc12..32ca4289c 100644 --- a/HIP-Basic/runtime_compilation/Makefile +++ b/HIP-Basic/runtime_compilation/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/saxpy/Makefile b/HIP-Basic/saxpy/Makefile index 7a52b3b20..683a7b5a8 100644 --- a/HIP-Basic/saxpy/Makefile +++ b/HIP-Basic/saxpy/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/shared_memory/Makefile b/HIP-Basic/shared_memory/Makefile index d557d1c3f..4c046da15 100644 --- a/HIP-Basic/shared_memory/Makefile +++ b/HIP-Basic/shared_memory/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/static_device_library/Makefile b/HIP-Basic/static_device_library/Makefile index 618236c6c..fe14521aa 100644 --- a/HIP-Basic/static_device_library/Makefile +++ b/HIP-Basic/static_device_library/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/static_host_library/Makefile b/HIP-Basic/static_host_library/Makefile index 6e9e00144..50603bc07 100644 --- a/HIP-Basic/static_host_library/Makefile +++ b/HIP-Basic/static_host_library/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/HIP-Basic/streams/Makefile b/HIP-Basic/streams/Makefile index 879e0e2cc..f283ce017 100644 --- a/HIP-Basic/streams/Makefile +++ b/HIP-Basic/streams/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/texture_management/Makefile b/HIP-Basic/texture_management/Makefile index 8e2765bd1..f61d2f423 100644 --- a/HIP-Basic/texture_management/Makefile +++ b/HIP-Basic/texture_management/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Basic/vulkan_interop/Makefile b/HIP-Basic/vulkan_interop/Makefile index d80c1d9c7..e5b94a81e 100644 --- a/HIP-Basic/vulkan_interop/Makefile +++ b/HIP-Basic/vulkan_interop/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/HIP-Basic/warp_shuffle/Makefile b/HIP-Basic/warp_shuffle/Makefile index 890db9bce..d52484fa4 100644 --- a/HIP-Basic/warp_shuffle/Makefile +++ b/HIP-Basic/warp_shuffle/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/calling_global_functions/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/calling_global_functions/Makefile index cf306747d..b5c4cfcc9 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/calling_global_functions/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/calling_global_functions/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_calling_global_functions GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/extern_shared_memory/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/extern_shared_memory/Makefile index 9a077de91..65deced32 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/extern_shared_memory/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/extern_shared_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_extern_shared_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/launch_bounds/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/launch_bounds/Makefile index e40c49c4e..813ec8f95 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/launch_bounds/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/launch_bounds/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_launch_bounds GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/set_constant_memory/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/set_constant_memory/Makefile index af53b7d34..22728efdf 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/set_constant_memory/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/set_constant_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_set_constant_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/Makefile index 1a9cb2818..0cd9d811e 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_template_warp_size_reduction GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/timer/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/timer/Makefile index 3557e6368..fd91a3473 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/timer/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/timer/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_timer GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/Makefile b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/Makefile index f22fdf5cb..5f67c77f7 100644 --- a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/Makefile +++ b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_warp_size_reduction GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Introduction-to-the-HIP-Programming-Model/add_kernel/Makefile b/HIP-Doc/Programming-Guide/Introduction-to-the-HIP-Programming-Model/add_kernel/Makefile index e2c710d33..f0f6c9475 100644 --- a/HIP-Doc/Programming-Guide/Introduction-to-the-HIP-Programming-Model/add_kernel/Makefile +++ b/HIP-Doc/Programming-Guide/Introduction-to-the-HIP-Programming-Model/add_kernel/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/address_retrieval/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/address_retrieval/Makefile index 5d30b8f64..80d34ee9a 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/address_retrieval/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/address_retrieval/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_address_retrieval GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/device_code_feature_identification/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/device_code_feature_identification/Makefile index 770b8db27..5a3ee689a 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/device_code_feature_identification/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/device_code_feature_identification/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_device_code_feature_identification GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/host_code_feature_identification/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/host_code_feature_identification/Makefile index 6791e4e80..45b67ece3 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/host_code_feature_identification/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/host_code_feature_identification/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_host_code_feature_identification GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_compilation_target_platform/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_compilation_target_platform/Makefile index d7f3835ba..73b7545e6 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_compilation_target_platform/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_compilation_target_platform/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_identifying_compilation_target_platform GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/Makefile index cf306747d..b5c4cfcc9 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_calling_global_functions GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module/Makefile index 3c54edc53..f13bd7278 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex/Makefile index f3aa716b1..454415848 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex_cuda/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex_cuda/Makefile index 822ba596b..e3a6822c9 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex_cuda/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/load_module_ex_cuda/Makefile @@ -24,7 +24,7 @@ EXAMPLE := cuda_load_module_ex GPU_RUNTIME ?= CUDA # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/per_thread_default_stream/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/per_thread_default_stream/Makefile index 908dc032c..30701a8b8 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/per_thread_default_stream/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/per_thread_default_stream/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_per_thread_default_stream GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/pointer_memory_type/Makefile b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/pointer_memory_type/Makefile index f5ca405fa..e39ad5a9c 100644 --- a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/pointer_memory_type/Makefile +++ b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/pointer_memory_type/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_pointer_memory_type GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/compilation_apis/Makefile b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/compilation_apis/Makefile index 61c135f83..861478b27 100644 --- a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/compilation_apis/Makefile +++ b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/compilation_apis/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_compilation_apis GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis/Makefile b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis/Makefile index 73fc47bb7..ac8f7a767 100644 --- a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis/Makefile +++ b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_linker_apis GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_file/Makefile b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_file/Makefile index 97efc48b0..1ba38e3c7 100644 --- a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_file/Makefile +++ b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_file/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_linker_apis_file GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_options/Makefile b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_options/Makefile index 64b5d0212..e6bfffdea 100644 --- a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_options/Makefile +++ b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/linker_apis_options/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_linker_apis_options GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/lowered_names/Makefile b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/lowered_names/Makefile index e2f9a150d..e4957ecd7 100644 --- a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/lowered_names/Makefile +++ b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/lowered_names/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_lowered_names GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/rtc_error_handling/Makefile b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/rtc_error_handling/Makefile index 88afb4ee5..fcc4f168c 100644 --- a/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/rtc_error_handling/Makefile +++ b/HIP-Doc/Programming-Guide/Programming-for-HIP-Runtime-Compiler/rtc_error_handling/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_rtc_error_handling GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/async_kernel_execution/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/async_kernel_execution/Makefile index 58b50b34a..c1900d3ce 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/async_kernel_execution/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/async_kernel_execution/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_async_kernel_execution GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/event_based_synchronization/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/event_based_synchronization/Makefile index 434e66773..eabb4bc5b 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/event_based_synchronization/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/event_based_synchronization/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_event_based_synchronization GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/sequential_kernel_execution/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/sequential_kernel_execution/Makefile index d6214e8a8..973ae644a 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/sequential_kernel_execution/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Asynchronous-Concurrent-Execution/sequential_kernel_execution/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_sequential_kernel_execution GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/call_stack_management/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/call_stack_management/Makefile index 4397d586a..61823cf36 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/call_stack_management/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/call_stack_management/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_call_stack_management GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/device_recursion/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/device_recursion/Makefile index 014dab5a5..3f9f7ad99 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/device_recursion/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Call-Stack/device_recursion/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_device_recursion GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Error-Handling/error_handling/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Error-Handling/error_handling/Makefile index 61d88e3f6..ea72d1a3c 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Error-Handling/error_handling/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Error-Handling/error_handling/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_error_handling GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_capture/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_capture/Makefile index a12573860..0a971f816 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_capture/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_capture/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_graph_capture GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_creation/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_creation/Makefile index ddb1ce26b..07feebdbc 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_creation/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/HIP-Graphs/graph_creation/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_graph_creation GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Initialization/simple_device_query/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Initialization/simple_device_query/Makefile index 6f5a74ee5..8368183a4 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Initialization/simple_device_query/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Initialization/simple_device_query/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_simple_device_query GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/constant_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/constant_memory/Makefile index b5afb44b5..569f73295 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/constant_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/constant_memory/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/dynamic_shared_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/dynamic_shared_memory/Makefile index d1d602a44..56d6db543 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/dynamic_shared_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/dynamic_shared_memory/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/explicit_copy/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/explicit_copy/Makefile index 9aaddef21..3d11cdef6 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/explicit_copy/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/explicit_copy/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/kernel_memory_allocation/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/kernel_memory_allocation/Makefile index bca050c38..a4e977396 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/kernel_memory_allocation/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/kernel_memory_allocation/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/static_shared_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/static_shared_memory/Makefile index bcde1903c..6cb392c94 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/static_shared_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Device-Memory/static_shared_memory/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pageable_host_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pageable_host_memory/Makefile index dd70f7b30..2b056f41e 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pageable_host_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pageable_host_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_pageable_host_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pinned_host_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pinned_host_memory/Makefile index 3736327fe..8f6356c8d 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pinned_host_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Host-Memory/pinned_host_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_pinned_host_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool/Makefile index f745837fb..9e3fe2035 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_memory_pool GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_resource_usage_statistics/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_resource_usage_statistics/Makefile index ffc87f725..4c5896f91 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_resource_usage_statistics/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_resource_usage_statistics/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_memory_pool_resource_usage_statistics GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_threshold/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_threshold/Makefile index 98679bfff..7a77b5394 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_threshold/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_threshold/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_memory_pool_threshold GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_trim/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_trim/Makefile index 22469ece9..43df17960 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_trim/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/memory_pool_trim/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_memory_pool_trim GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/ordinary_memory_allocation/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/ordinary_memory_allocation/Makefile index eac4d90dd..cdf6fa395 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/ordinary_memory_allocation/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/ordinary_memory_allocation/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_ordinary_memory_allocation GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/stream_ordered_memory_allocation/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/stream_ordered_memory_allocation/Makefile index b3da075b8..9d81efcc5 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/stream_ordered_memory_allocation/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/SOMA/stream_ordered_memory_allocation/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_stream_ordered_memory_allocation GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/data_prefetching/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/data_prefetching/Makefile index bebf31057..064ab182f 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/data_prefetching/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/data_prefetching/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_data_prefetching GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/dynamic_unified_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/dynamic_unified_memory/Makefile index 96140061a..6fb13d329 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/dynamic_unified_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/dynamic_unified_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_dynamic_unified_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/explicit_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/explicit_memory/Makefile index ac5bc2df3..2e0d28318 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/explicit_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/explicit_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_explicit_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/memory_range_attributes/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/memory_range_attributes/Makefile index c57819d61..ccd0e690e 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/memory_range_attributes/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/memory_range_attributes/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_memory_range_attributes GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/standard_unified_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/standard_unified_memory/Makefile index 30c69ad83..61fe00455 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/standard_unified_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/standard_unified_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_standard_unified_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/static_unified_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/static_unified_memory/Makefile index 19cb33ab3..a947e1a39 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/static_unified_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/static_unified_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_static_unified_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/unified_memory_advice/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/unified_memory_advice/Makefile index a8596b91b..ab951099f 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/unified_memory_advice/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Unified-Memory-Management/unified_memory_advice/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_unified_memory_advice GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Virtual-Memory-Management/virtual_memory/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Virtual-Memory-Management/virtual_memory/Makefile index 2bbb1a443..e50f242b3 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Virtual-Memory-Management/virtual_memory/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Memory-Management/Virtual-Memory-Management/virtual_memory/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_virtual_memory GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_enumeration/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_enumeration/Makefile index 9a714f40b..820e53a9f 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_enumeration/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_enumeration/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_device_enumeration GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_selection/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_selection/Makefile index 354b50502..981946ea7 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_selection/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/device_selection/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_device_selection GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/multi_device_synchronization/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/multi_device_synchronization/Makefile index d227dd6d7..4ec423d86 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/multi_device_synchronization/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/multi_device_synchronization/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_multi_device_synchronization GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access/Makefile index 99a2b1224..8b7f400cb 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_p2p_memory_access GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access_host_staging/Makefile b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access_host_staging/Makefile index 88e95fa69..399cfccfe 100644 --- a/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access_host_staging/Makefile +++ b/HIP-Doc/Programming-Guide/Using-HIP-Runtime-API/Multi-Device-Management/p2p_memory_access_host_staging/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_p2p_memory_access_host_staging GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Reference/CUDA-to-HIP-API-Function-Comparison/block_reduction/Makefile b/HIP-Doc/Reference/CUDA-to-HIP-API-Function-Comparison/block_reduction/Makefile index 2317bc96c..5c6aecaeb 100644 --- a/HIP-Doc/Reference/CUDA-to-HIP-API-Function-Comparison/block_reduction/Makefile +++ b/HIP-Doc/Reference/CUDA-to-HIP-API-Function-Comparison/block_reduction/Makefile @@ -24,7 +24,7 @@ EXAMPLE := cuda_block_reduction GPU_RUNTIME ?= CUDA # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Reference/HIP-Complex-Math-API/complex_math/Makefile b/HIP-Doc/Reference/HIP-Complex-Math-API/complex_math/Makefile index d1d61394b..07b55a874 100644 --- a/HIP-Doc/Reference/HIP-Complex-Math-API/complex_math/Makefile +++ b/HIP-Doc/Reference/HIP-Complex-Math-API/complex_math/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_complex_math GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Reference/HIP-Math-API/math/Makefile b/HIP-Doc/Reference/HIP-Math-API/math/Makefile index 2481e83c1..3a65fa637 100644 --- a/HIP-Doc/Reference/HIP-Math-API/math/Makefile +++ b/HIP-Doc/Reference/HIP-Math-API/math/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_math GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp16/Makefile b/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp16/Makefile index 059fc2561..793b32042 100644 --- a/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp16/Makefile +++ b/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp16/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_low_precision_float_fp16 GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp8/Makefile b/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp8/Makefile index 269540df4..fbbabc002 100644 --- a/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp8/Makefile +++ b/HIP-Doc/Reference/Low-Precision-Floating-Point-Types/low_precision_float_fp8/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_low_precision_float_fp8 GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile index fb703da93..9f16b7e81 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile @@ -25,7 +25,7 @@ GRAPHGEN := graphgen GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile index 2c798735f..387d5c0bc 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_histogram_atomics GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile index b893a9730..19e78bcc2 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/image_convolution/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_image_convolution GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile index be78ebad1..e9512e9f5 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/kmeans/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_kmeans GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile index 24224e9ce..6be858841 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/matrix_multiplication/Makefile @@ -24,7 +24,7 @@ EXAMPLE := hip_matrix_multiply GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile b/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile index 021959694..401663d69 100644 --- a/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile +++ b/Libraries/MIGraphX/migraphx/cpp_dynamic_batch/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile b/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile index 3a9b2df10..68ace8156 100644 --- a/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile +++ b/Libraries/MIGraphX/migraphx/cpp_parse_load_save/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile b/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile index 0a6af2900..3f9266d5c 100644 --- a/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile +++ b/Libraries/MIGraphX/migraphx/custom_op_hip_kernel/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile b/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile index e7de8040a..5fb52a339 100644 --- a/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile +++ b/Libraries/MIGraphX/migraphx/custom_op_miopen_kernel/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile b/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile index d57f4db00..cf5849d16 100644 --- a/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile +++ b/Libraries/MIGraphX/migraphx/custom_op_rocblas_kernel/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIGraphX/vision/cpp_mnist/Makefile b/Libraries/MIGraphX/vision/cpp_mnist/Makefile index e12fc8e77..3bb8471c9 100644 --- a/Libraries/MIGraphX/vision/cpp_mnist/Makefile +++ b/Libraries/MIGraphX/vision/cpp_mnist/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include MIGRAPHX_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/MIVisionX/canny/Makefile b/Libraries/MIVisionX/canny/Makefile index 2267b588a..d87116bb8 100644 --- a/Libraries/MIVisionX/canny/Makefile +++ b/Libraries/MIVisionX/canny/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External # ROCm installation directory -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) # MIVisionX and OpenCV include directories MIVISIONX_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include/mivisionx diff --git a/Libraries/MIVisionX/mv_objdetect/Makefile b/Libraries/MIVisionX/mv_objdetect/Makefile index cb22fdd89..1b0ab45a5 100644 --- a/Libraries/MIVisionX/mv_objdetect/Makefile +++ b/Libraries/MIVisionX/mv_objdetect/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External # ROCm installation directory -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) # Batch size configuration (can be overridden: make BATCH_SIZE=4) BATCH_SIZE := 1 diff --git a/Libraries/MIVisionX/opencv_orb/Makefile b/Libraries/MIVisionX/opencv_orb/Makefile index 2848d8280..2ad162f86 100644 --- a/Libraries/MIVisionX/opencv_orb/Makefile +++ b/Libraries/MIVisionX/opencv_orb/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External # ROCm installation directory -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) # MIVisionX and OpenCV include directories MIVISIONX_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include/mivisionx diff --git a/Libraries/RCCL/allgather/Makefile b/Libraries/RCCL/allgather/Makefile index 45f3f38b5..df331b664 100644 --- a/Libraries/RCCL/allgather/Makefile +++ b/Libraries/RCCL/allgather/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/allreduce/Makefile b/Libraries/RCCL/allreduce/Makefile index 93b334289..937fbae9e 100644 --- a/Libraries/RCCL/allreduce/Makefile +++ b/Libraries/RCCL/allreduce/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/broadcast/Makefile b/Libraries/RCCL/broadcast/Makefile index d4397b217..636d9d949 100644 --- a/Libraries/RCCL/broadcast/Makefile +++ b/Libraries/RCCL/broadcast/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/buffer_registration/Makefile b/Libraries/RCCL/buffer_registration/Makefile index fe82d4a1d..8c4d40a14 100644 --- a/Libraries/RCCL/buffer_registration/Makefile +++ b/Libraries/RCCL/buffer_registration/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/device_api/Makefile b/Libraries/RCCL/device_api/Makefile index 752a2e9bb..2e65c8024 100644 --- a/Libraries/RCCL/device_api/Makefile +++ b/Libraries/RCCL/device_api/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/gradient_allreduce/Makefile b/Libraries/RCCL/gradient_allreduce/Makefile index 1f8cce63e..1c53a9b52 100644 --- a/Libraries/RCCL/gradient_allreduce/Makefile +++ b/Libraries/RCCL/gradient_allreduce/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/reduce/Makefile b/Libraries/RCCL/reduce/Makefile index 56a40791f..60e7773c9 100644 --- a/Libraries/RCCL/reduce/Makefile +++ b/Libraries/RCCL/reduce/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/reducescatter/Makefile b/Libraries/RCCL/reducescatter/Makefile index 8ce5af696..c2c144814 100644 --- a/Libraries/RCCL/reducescatter/Makefile +++ b/Libraries/RCCL/reducescatter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RCCL/send_recv/Makefile b/Libraries/RCCL/send_recv/Makefile index 2da563bb6..a30a538d3 100644 --- a/Libraries/RCCL/send_recv/Makefile +++ b/Libraries/RCCL/send_recv/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RCCL_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/box_filter/Makefile b/Libraries/RPP/box_filter/Makefile index 00fb5cc5e..a16745bc1 100644 --- a/Libraries/RPP/box_filter/Makefile +++ b/Libraries/RPP/box_filter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/brightness/Makefile b/Libraries/RPP/brightness/Makefile index 6f83583ea..90db33979 100644 --- a/Libraries/RPP/brightness/Makefile +++ b/Libraries/RPP/brightness/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/contrast/Makefile b/Libraries/RPP/contrast/Makefile index d277922f6..74e01b4d7 100644 --- a/Libraries/RPP/contrast/Makefile +++ b/Libraries/RPP/contrast/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/flip/Makefile b/Libraries/RPP/flip/Makefile index 3f51cfdd9..a0481b4d6 100644 --- a/Libraries/RPP/flip/Makefile +++ b/Libraries/RPP/flip/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/gamma_correction/Makefile b/Libraries/RPP/gamma_correction/Makefile index a7ac06eb6..623d56d87 100644 --- a/Libraries/RPP/gamma_correction/Makefile +++ b/Libraries/RPP/gamma_correction/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/RPP/resize/Makefile b/Libraries/RPP/resize/Makefile index 19d2a68d1..af0553553 100644 --- a/Libraries/RPP/resize/Makefile +++ b/Libraries/RPP/resize/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLAS/gemm_strided_batched/Makefile b/Libraries/hipBLAS/gemm_strided_batched/Makefile index 4ea62e69c..c1108bd41 100644 --- a/Libraries/hipBLAS/gemm_strided_batched/Makefile +++ b/Libraries/hipBLAS/gemm_strided_batched/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLAS/her/Makefile b/Libraries/hipBLAS/her/Makefile index 0dc08e149..dd7b01d83 100644 --- a/Libraries/hipBLAS/her/Makefile +++ b/Libraries/hipBLAS/her/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLAS/scal/Makefile b/Libraries/hipBLAS/scal/Makefile index 18a0ac1f1..aebd65e4c 100644 --- a/Libraries/hipBLAS/scal/Makefile +++ b/Libraries/hipBLAS/scal/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/ext_op_amax/Makefile b/Libraries/hipBLASLt/ext_op_amax/Makefile index 3b74bf22d..2aef0f6cc 100644 --- a/Libraries/hipBLASLt/ext_op_amax/Makefile +++ b/Libraries/hipBLASLt/ext_op_amax/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/ext_op_layernorm/Makefile b/Libraries/hipBLASLt/ext_op_layernorm/Makefile index 040c026ff..de94c0f3b 100644 --- a/Libraries/hipBLASLt/ext_op_layernorm/Makefile +++ b/Libraries/hipBLASLt/ext_op_layernorm/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm/Makefile b/Libraries/hipBLASLt/gemm/Makefile index bf3732e6e..1aea20cc3 100644 --- a/Libraries/hipBLASLt/gemm/Makefile +++ b/Libraries/hipBLASLt/gemm/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_alphavec_ext/Makefile b/Libraries/hipBLASLt/gemm_alphavec_ext/Makefile index 2814b2a19..fe9309d6e 100644 --- a/Libraries/hipBLASLt/gemm_alphavec_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_alphavec_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_amax/Makefile b/Libraries/hipBLASLt/gemm_amax/Makefile index 9748b0cc4..438a7bbde 100644 --- a/Libraries/hipBLASLt/gemm_amax/Makefile +++ b/Libraries/hipBLASLt/gemm_amax/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_amax_ext/Makefile b/Libraries/hipBLASLt/gemm_amax_ext/Makefile index bcb2f2e6b..faee18f4e 100644 --- a/Libraries/hipBLASLt/gemm_amax_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_amax_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_amax_with_scale/Makefile b/Libraries/hipBLASLt/gemm_amax_with_scale/Makefile index 45cb417fa..1571c4cd5 100644 --- a/Libraries/hipBLASLt/gemm_amax_with_scale/Makefile +++ b/Libraries/hipBLASLt/gemm_amax_with_scale/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_amax_with_scale_ext/Makefile b/Libraries/hipBLASLt/gemm_amax_with_scale_ext/Makefile index 503ba3164..1e25991bd 100644 --- a/Libraries/hipBLASLt/gemm_amax_with_scale_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_amax_with_scale_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_attr_tciA_tciB/Makefile b/Libraries/hipBLASLt/gemm_attr_tciA_tciB/Makefile index 474675847..b7dd97830 100644 --- a/Libraries/hipBLASLt/gemm_attr_tciA_tciB/Makefile +++ b/Libraries/hipBLASLt/gemm_attr_tciA_tciB/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_batched/Makefile b/Libraries/hipBLASLt/gemm_batched/Makefile index 229edc54b..fac07f5ba 100644 --- a/Libraries/hipBLASLt/gemm_batched/Makefile +++ b/Libraries/hipBLASLt/gemm_batched/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_batched_ext/Makefile b/Libraries/hipBLASLt/gemm_batched_ext/Makefile index 8946d844d..d780f925e 100644 --- a/Libraries/hipBLASLt/gemm_batched_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_batched_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_bgradb/Makefile b/Libraries/hipBLASLt/gemm_bgradb/Makefile index f3aa29d75..541ff9839 100644 --- a/Libraries/hipBLASLt/gemm_bgradb/Makefile +++ b/Libraries/hipBLASLt/gemm_bgradb/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_bias/Makefile b/Libraries/hipBLASLt/gemm_bias/Makefile index 65f0f9ef7..5ccf39e5e 100644 --- a/Libraries/hipBLASLt/gemm_bias/Makefile +++ b/Libraries/hipBLASLt/gemm_bias/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_bias_ext/Makefile b/Libraries/hipBLASLt/gemm_bias_ext/Makefile index 3c8c2a032..c16b2f25d 100644 --- a/Libraries/hipBLASLt/gemm_bias_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_bias_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_bias_swizzle_a_ext/Makefile b/Libraries/hipBLASLt/gemm_bias_swizzle_a_ext/Makefile index ddce7b4cd..61fa38ac7 100644 --- a/Libraries/hipBLASLt/gemm_bias_swizzle_a_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_bias_swizzle_a_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_clamp_bias/Makefile b/Libraries/hipBLASLt/gemm_clamp_bias/Makefile index 6d966918c..a1a02a15c 100644 --- a/Libraries/hipBLASLt/gemm_clamp_bias/Makefile +++ b/Libraries/hipBLASLt/gemm_clamp_bias/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_dgelu_bgradb/Makefile b/Libraries/hipBLASLt/gemm_dgelu_bgradb/Makefile index 4e3dd86bd..7a89bcb66 100644 --- a/Libraries/hipBLASLt/gemm_dgelu_bgradb/Makefile +++ b/Libraries/hipBLASLt/gemm_dgelu_bgradb/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_dgelu_bgradb_ext/Makefile b/Libraries/hipBLASLt/gemm_dgelu_bgradb_ext/Makefile index faadb5db5..4973c4af9 100644 --- a/Libraries/hipBLASLt/gemm_dgelu_bgradb_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_dgelu_bgradb_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_ext/Makefile b/Libraries/hipBLASLt/gemm_ext/Makefile index c375fa87c..a18ba4cfa 100644 --- a/Libraries/hipBLASLt/gemm_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_ext_bgradb/Makefile b/Libraries/hipBLASLt/gemm_ext_bgradb/Makefile index 376dfbce2..99f5f98f5 100644 --- a/Libraries/hipBLASLt/gemm_ext_bgradb/Makefile +++ b/Libraries/hipBLASLt/gemm_ext_bgradb/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_gelu_aux_bias/Makefile b/Libraries/hipBLASLt/gemm_gelu_aux_bias/Makefile index 75575f331..dbe0c86f9 100644 --- a/Libraries/hipBLASLt/gemm_gelu_aux_bias/Makefile +++ b/Libraries/hipBLASLt/gemm_gelu_aux_bias/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_gelu_aux_bias_ext/Makefile b/Libraries/hipBLASLt/gemm_gelu_aux_bias_ext/Makefile index 87ade4d2f..10bda0143 100644 --- a/Libraries/hipBLASLt/gemm_gelu_aux_bias_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_gelu_aux_bias_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_get_algo_by_index_ext/Makefile b/Libraries/hipBLASLt/gemm_get_algo_by_index_ext/Makefile index 950dc3b1b..233da6124 100644 --- a/Libraries/hipBLASLt/gemm_get_algo_by_index_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_get_algo_by_index_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_get_all_algos/Makefile b/Libraries/hipBLASLt/gemm_get_all_algos/Makefile index 879d85bd9..6eba40c8c 100644 --- a/Libraries/hipBLASLt/gemm_get_all_algos/Makefile +++ b/Libraries/hipBLASLt/gemm_get_all_algos/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_get_all_algos_ext/Makefile b/Libraries/hipBLASLt/gemm_get_all_algos_ext/Makefile index 7c402edf4..37f461544 100644 --- a/Libraries/hipBLASLt/gemm_get_all_algos_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_get_all_algos_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_is_tuned_ext/Makefile b/Libraries/hipBLASLt/gemm_is_tuned_ext/Makefile index 16da7aa30..de8dfeab6 100644 --- a/Libraries/hipBLASLt/gemm_is_tuned_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_is_tuned_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_mix_precision/Makefile b/Libraries/hipBLASLt/gemm_mix_precision/Makefile index 9c30f6f83..e431ee4b7 100644 --- a/Libraries/hipBLASLt/gemm_mix_precision/Makefile +++ b/Libraries/hipBLASLt/gemm_mix_precision/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_mix_precision_ext/Makefile b/Libraries/hipBLASLt/gemm_mix_precision_ext/Makefile index 53714a1fd..4175c645e 100644 --- a/Libraries/hipBLASLt/gemm_mix_precision_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_mix_precision_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_mix_precision_with_amax_ext/Makefile b/Libraries/hipBLASLt/gemm_mix_precision_with_amax_ext/Makefile index 4dd22b785..db5466d36 100644 --- a/Libraries/hipBLASLt/gemm_mix_precision_with_amax_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_mix_precision_with_amax_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_swish_bias/Makefile b/Libraries/hipBLASLt/gemm_swish_bias/Makefile index 3f47b8413..cb5cf11d3 100644 --- a/Libraries/hipBLASLt/gemm_swish_bias/Makefile +++ b/Libraries/hipBLASLt/gemm_swish_bias/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_swizzle_a/Makefile b/Libraries/hipBLASLt/gemm_swizzle_a/Makefile index 813eb7667..fdc9277c0 100644 --- a/Libraries/hipBLASLt/gemm_swizzle_a/Makefile +++ b/Libraries/hipBLASLt/gemm_swizzle_a/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_swizzle_b/Makefile b/Libraries/hipBLASLt/gemm_swizzle_b/Makefile index 09a3aaa9b..4b2f77c8b 100644 --- a/Libraries/hipBLASLt/gemm_swizzle_b/Makefile +++ b/Libraries/hipBLASLt/gemm_swizzle_b/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_tuning_splitk_ext/Makefile b/Libraries/hipBLASLt/gemm_tuning_splitk_ext/Makefile index bdb1a4f8b..ca99ebfa7 100644 --- a/Libraries/hipBLASLt/gemm_tuning_splitk_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_tuning_splitk_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_tuning_wgm_ext/Makefile b/Libraries/hipBLASLt/gemm_tuning_wgm_ext/Makefile index c206dbfae..59361679c 100644 --- a/Libraries/hipBLASLt/gemm_tuning_wgm_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_tuning_wgm_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_with_TF32/Makefile b/Libraries/hipBLASLt/gemm_with_TF32/Makefile index b0b568972..5845c8815 100644 --- a/Libraries/hipBLASLt/gemm_with_TF32/Makefile +++ b/Libraries/hipBLASLt/gemm_with_TF32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_with_scale_a_b/Makefile b/Libraries/hipBLASLt/gemm_with_scale_a_b/Makefile index 2e54a9f88..886a95a24 100644 --- a/Libraries/hipBLASLt/gemm_with_scale_a_b/Makefile +++ b/Libraries/hipBLASLt/gemm_with_scale_a_b/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_with_scale_a_b_ext/Makefile b/Libraries/hipBLASLt/gemm_with_scale_a_b_ext/Makefile index 6980503bd..cc1fdba02 100644 --- a/Libraries/hipBLASLt/gemm_with_scale_a_b_ext/Makefile +++ b/Libraries/hipBLASLt/gemm_with_scale_a_b_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/gemm_with_scale_a_b_vector/Makefile b/Libraries/hipBLASLt/gemm_with_scale_a_b_vector/Makefile index eaf0675ed..5a5856849 100644 --- a/Libraries/hipBLASLt/gemm_with_scale_a_b_vector/Makefile +++ b/Libraries/hipBLASLt/gemm_with_scale_a_b_vector/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/groupedgemm_ext/Makefile b/Libraries/hipBLASLt/groupedgemm_ext/Makefile index 38a3f3d82..55e481207 100644 --- a/Libraries/hipBLASLt/groupedgemm_ext/Makefile +++ b/Libraries/hipBLASLt/groupedgemm_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/groupedgemm_fixed_mk_ext/Makefile b/Libraries/hipBLASLt/groupedgemm_fixed_mk_ext/Makefile index 3265a5990..f1bb5b68d 100644 --- a/Libraries/hipBLASLt/groupedgemm_fixed_mk_ext/Makefile +++ b/Libraries/hipBLASLt/groupedgemm_fixed_mk_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/groupedgemm_get_all_algos_ext/Makefile b/Libraries/hipBLASLt/groupedgemm_get_all_algos_ext/Makefile index 7f213cda1..270ca7f49 100644 --- a/Libraries/hipBLASLt/groupedgemm_get_all_algos_ext/Makefile +++ b/Libraries/hipBLASLt/groupedgemm_get_all_algos_ext/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipBLASLt/weight_swizzle_padding/Makefile b/Libraries/hipBLASLt/weight_swizzle_padding/Makefile index 8edcb99aa..04baeb89d 100644 --- a/Libraries/hipBLASLt/weight_swizzle_padding/Makefile +++ b/Libraries/hipBLASLt/weight_swizzle_padding/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipCUB/device_radix_sort/Makefile b/Libraries/hipCUB/device_radix_sort/Makefile index bd13bab59..b18dd91ab 100644 --- a/Libraries/hipCUB/device_radix_sort/Makefile +++ b/Libraries/hipCUB/device_radix_sort/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipCUB/device_sum/Makefile b/Libraries/hipCUB/device_sum/Makefile index 134950983..1efcea6c0 100644 --- a/Libraries/hipCUB/device_sum/Makefile +++ b/Libraries/hipCUB/device_sum/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipFFT/callback/Makefile b/Libraries/hipFFT/callback/Makefile index a74c788b2..a73d55e69 100644 --- a/Libraries/hipFFT/callback/Makefile +++ b/Libraries/hipFFT/callback/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipFFT/multi_gpu/Makefile b/Libraries/hipFFT/multi_gpu/Makefile index 71f7913b0..694e5302a 100644 --- a/Libraries/hipFFT/multi_gpu/Makefile +++ b/Libraries/hipFFT/multi_gpu/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipFFT/plan_d2z/Makefile b/Libraries/hipFFT/plan_d2z/Makefile index 9acdae6ca..173bd369e 100644 --- a/Libraries/hipFFT/plan_d2z/Makefile +++ b/Libraries/hipFFT/plan_d2z/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipFFT/plan_many_2d_r2c/Makefile b/Libraries/hipFFT/plan_many_2d_r2c/Makefile index c4a72c647..3cbc33f4c 100644 --- a/Libraries/hipFFT/plan_many_2d_r2c/Makefile +++ b/Libraries/hipFFT/plan_many_2d_r2c/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipFFT/plan_many_2d_z2z/Makefile b/Libraries/hipFFT/plan_many_2d_z2z/Makefile index 6109ecbd0..7656872f8 100644 --- a/Libraries/hipFFT/plan_many_2d_z2z/Makefile +++ b/Libraries/hipFFT/plan_many_2d_z2z/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipFFT/plan_z2z/Makefile b/Libraries/hipFFT/plan_z2z/Makefile index c574222b9..974ced8c8 100644 --- a/Libraries/hipFFT/plan_z2z/Makefile +++ b/Libraries/hipFFT/plan_z2z/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipFFT/setworkarea/Makefile b/Libraries/hipFFT/setworkarea/Makefile index 89425bccd..5a553a0c0 100644 --- a/Libraries/hipFFT/setworkarea/Makefile +++ b/Libraries/hipFFT/setworkarea/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipRAND/c_cpp_api/simple_distributions_cpp/Makefile b/Libraries/hipRAND/c_cpp_api/simple_distributions_cpp/Makefile index 094425464..e5b6b0016 100644 --- a/Libraries/hipRAND/c_cpp_api/simple_distributions_cpp/Makefile +++ b/Libraries/hipRAND/c_cpp_api/simple_distributions_cpp/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipRAND/device_api/pseudorandom_generations/Makefile b/Libraries/hipRAND/device_api/pseudorandom_generations/Makefile index 650ddf7d8..44c6fe9ee 100644 --- a/Libraries/hipRAND/device_api/pseudorandom_generations/Makefile +++ b/Libraries/hipRAND/device_api/pseudorandom_generations/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipRAND/device_api/quasirandom_generations/Makefile b/Libraries/hipRAND/device_api/quasirandom_generations/Makefile index 01840cf06..265c74dfa 100644 --- a/Libraries/hipRAND/device_api/quasirandom_generations/Makefile +++ b/Libraries/hipRAND/device_api/quasirandom_generations/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/gels/Makefile b/Libraries/hipSOLVER/gels/Makefile index ea7d01e84..f696656b0 100644 --- a/Libraries/hipSOLVER/gels/Makefile +++ b/Libraries/hipSOLVER/gels/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/geqrf/Makefile b/Libraries/hipSOLVER/geqrf/Makefile index 951c39485..c626cea70 100644 --- a/Libraries/hipSOLVER/geqrf/Makefile +++ b/Libraries/hipSOLVER/geqrf/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/gesvd/Makefile b/Libraries/hipSOLVER/gesvd/Makefile index 439aeeff7..91496e69c 100644 --- a/Libraries/hipSOLVER/gesvd/Makefile +++ b/Libraries/hipSOLVER/gesvd/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/getrf/Makefile b/Libraries/hipSOLVER/getrf/Makefile index 996985628..dd4cc1fea 100644 --- a/Libraries/hipSOLVER/getrf/Makefile +++ b/Libraries/hipSOLVER/getrf/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/potrf/Makefile b/Libraries/hipSOLVER/potrf/Makefile index b54298d82..7c87f6b85 100644 --- a/Libraries/hipSOLVER/potrf/Makefile +++ b/Libraries/hipSOLVER/potrf/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/syevd/Makefile b/Libraries/hipSOLVER/syevd/Makefile index a97157b47..9c5e08e28 100644 --- a/Libraries/hipSOLVER/syevd/Makefile +++ b/Libraries/hipSOLVER/syevd/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/syevdx/Makefile b/Libraries/hipSOLVER/syevdx/Makefile index 3967f5277..b17be2ccd 100644 --- a/Libraries/hipSOLVER/syevdx/Makefile +++ b/Libraries/hipSOLVER/syevdx/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/syevj/Makefile b/Libraries/hipSOLVER/syevj/Makefile index 00feef261..14c4a8f41 100644 --- a/Libraries/hipSOLVER/syevj/Makefile +++ b/Libraries/hipSOLVER/syevj/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/syevj_batched/Makefile b/Libraries/hipSOLVER/syevj_batched/Makefile index 6014e9343..d33155a0c 100644 --- a/Libraries/hipSOLVER/syevj_batched/Makefile +++ b/Libraries/hipSOLVER/syevj_batched/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/sygvd/Makefile b/Libraries/hipSOLVER/sygvd/Makefile index a614217f0..d1f5303d0 100644 --- a/Libraries/hipSOLVER/sygvd/Makefile +++ b/Libraries/hipSOLVER/sygvd/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSOLVER/sygvj/Makefile b/Libraries/hipSOLVER/sygvj/Makefile index 3aa2c71ef..0bf97891f 100644 --- a/Libraries/hipSOLVER/sygvj/Makefile +++ b/Libraries/hipSOLVER/sygvj/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSPARSE/axpyi/Makefile b/Libraries/hipSPARSE/axpyi/Makefile index 7f553f8ec..b7eec991c 100644 --- a/Libraries/hipSPARSE/axpyi/Makefile +++ b/Libraries/hipSPARSE/axpyi/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipSPARSE/csrmv/Makefile b/Libraries/hipSPARSE/csrmv/Makefile index 1404ac904..c38d1fd69 100644 --- a/Libraries/hipSPARSE/csrmv/Makefile +++ b/Libraries/hipSPARSE/csrmv/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipSPARSE/handle/Makefile b/Libraries/hipSPARSE/handle/Makefile index ba4aff62c..be0cf4a77 100644 --- a/Libraries/hipSPARSE/handle/Makefile +++ b/Libraries/hipSPARSE/handle/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipSPARSE/hybmv/Makefile b/Libraries/hipSPARSE/hybmv/Makefile index a2fa5865d..872c2ff4a 100644 --- a/Libraries/hipSPARSE/hybmv/Makefile +++ b/Libraries/hipSPARSE/hybmv/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipSPARSELt/spmm/Makefile b/Libraries/hipSPARSELt/spmm/Makefile index 1a01825f1..9a7354f7e 100644 --- a/Libraries/hipSPARSELt/spmm/Makefile +++ b/Libraries/hipSPARSELt/spmm/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipSPARSELt/spmm_advanced/Makefile b/Libraries/hipSPARSELt/spmm_advanced/Makefile index 9e263c13d..d7fbabaea 100644 --- a/Libraries/hipSPARSELt/spmm_advanced/Makefile +++ b/Libraries/hipSPARSELt/spmm_advanced/Makefile @@ -25,7 +25,7 @@ COMMON_INCLUDE_DIR := ../../../Common GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/hipTensor/contraction/bilinear/bf16_f32/Makefile b/Libraries/hipTensor/contraction/bilinear/bf16_f32/Makefile index 7600fea4c..8ae761081 100644 --- a/Libraries/hipTensor/contraction/bilinear/bf16_f32/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/bf16_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/cf32_cf32/Makefile b/Libraries/hipTensor/contraction/bilinear/cf32_cf32/Makefile index 108802523..f8550538c 100644 --- a/Libraries/hipTensor/contraction/bilinear/cf32_cf32/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/cf32_cf32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/f16_f32/Makefile b/Libraries/hipTensor/contraction/bilinear/f16_f32/Makefile index 36ae53e44..04c343634 100644 --- a/Libraries/hipTensor/contraction/bilinear/f16_f32/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/f16_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/f32_bf16/Makefile b/Libraries/hipTensor/contraction/bilinear/f32_bf16/Makefile index bfc796888..c22d35dc8 100644 --- a/Libraries/hipTensor/contraction/bilinear/f32_bf16/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/f32_bf16/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/f32_f16/Makefile b/Libraries/hipTensor/contraction/bilinear/f32_f16/Makefile index c9dc871b3..5fcf02952 100644 --- a/Libraries/hipTensor/contraction/bilinear/f32_f16/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/f32_f16/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/f32_f32/Makefile b/Libraries/hipTensor/contraction/bilinear/f32_f32/Makefile index eb2b7c50d..8887d3870 100644 --- a/Libraries/hipTensor/contraction/bilinear/f32_f32/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/f32_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/f64_f32/Makefile b/Libraries/hipTensor/contraction/bilinear/f64_f32/Makefile index 557eb50a7..4004e6578 100644 --- a/Libraries/hipTensor/contraction/bilinear/f64_f32/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/f64_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/bilinear/f64_f64/Makefile b/Libraries/hipTensor/contraction/bilinear/f64_f64/Makefile index 7a910b931..5ce5cca58 100644 --- a/Libraries/hipTensor/contraction/bilinear/f64_f64/Makefile +++ b/Libraries/hipTensor/contraction/bilinear/f64_f64/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/bf16_f32/Makefile b/Libraries/hipTensor/contraction/scale/bf16_f32/Makefile index 0ba60ffce..49c3d9dac 100644 --- a/Libraries/hipTensor/contraction/scale/bf16_f32/Makefile +++ b/Libraries/hipTensor/contraction/scale/bf16_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/cf32_cf32/Makefile b/Libraries/hipTensor/contraction/scale/cf32_cf32/Makefile index 69b72f577..f608188fe 100644 --- a/Libraries/hipTensor/contraction/scale/cf32_cf32/Makefile +++ b/Libraries/hipTensor/contraction/scale/cf32_cf32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/f16_f32/Makefile b/Libraries/hipTensor/contraction/scale/f16_f32/Makefile index e9a556a32..fa8f5e94b 100644 --- a/Libraries/hipTensor/contraction/scale/f16_f32/Makefile +++ b/Libraries/hipTensor/contraction/scale/f16_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/f32_bf16/Makefile b/Libraries/hipTensor/contraction/scale/f32_bf16/Makefile index 93efce6ab..e4aba45a9 100644 --- a/Libraries/hipTensor/contraction/scale/f32_bf16/Makefile +++ b/Libraries/hipTensor/contraction/scale/f32_bf16/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/f32_f16/Makefile b/Libraries/hipTensor/contraction/scale/f32_f16/Makefile index c21220f54..2e88d2d9e 100644 --- a/Libraries/hipTensor/contraction/scale/f32_f16/Makefile +++ b/Libraries/hipTensor/contraction/scale/f32_f16/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/f32_f32/Makefile b/Libraries/hipTensor/contraction/scale/f32_f32/Makefile index fb49a8fb7..a31322683 100644 --- a/Libraries/hipTensor/contraction/scale/f32_f32/Makefile +++ b/Libraries/hipTensor/contraction/scale/f32_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/f64_f32/Makefile b/Libraries/hipTensor/contraction/scale/f64_f32/Makefile index 95e1bcd20..2f35357b8 100644 --- a/Libraries/hipTensor/contraction/scale/f64_f32/Makefile +++ b/Libraries/hipTensor/contraction/scale/f64_f32/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/contraction/scale/f64_f64/Makefile b/Libraries/hipTensor/contraction/scale/f64_f64/Makefile index 6bd439ba0..b5c612dab 100644 --- a/Libraries/hipTensor/contraction/scale/f64_f64/Makefile +++ b/Libraries/hipTensor/contraction/scale/f64_f64/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/elementwise/binary/Makefile b/Libraries/hipTensor/elementwise/binary/Makefile index d9a9cda08..7a77bdaca 100644 --- a/Libraries/hipTensor/elementwise/binary/Makefile +++ b/Libraries/hipTensor/elementwise/binary/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/elementwise/permute/Makefile b/Libraries/hipTensor/elementwise/permute/Makefile index 300c1447b..3d96e9ce8 100644 --- a/Libraries/hipTensor/elementwise/permute/Makefile +++ b/Libraries/hipTensor/elementwise/permute/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/elementwise/trinary/Makefile b/Libraries/hipTensor/elementwise/trinary/Makefile index 21645464d..6ce902548 100644 --- a/Libraries/hipTensor/elementwise/trinary/Makefile +++ b/Libraries/hipTensor/elementwise/trinary/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/hipTensor/reduction/Makefile b/Libraries/hipTensor/reduction/Makefile index 0e561c4b9..305d2822a 100644 --- a/Libraries/hipTensor/reduction/Makefile +++ b/Libraries/hipTensor/reduction/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPBLASLT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocAL/basic/Makefile b/Libraries/rocAL/basic/Makefile index 1a811b629..b91ee16c0 100644 --- a/Libraries/rocAL/basic/Makefile +++ b/Libraries/rocAL/basic/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocAL/dataloader/Makefile b/Libraries/rocAL/dataloader/Makefile index f9104cbae..e2bd57687 100644 --- a/Libraries/rocAL/dataloader/Makefile +++ b/Libraries/rocAL/dataloader/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocAL/image_augmentation/Makefile b/Libraries/rocAL/image_augmentation/Makefile index 063b6099c..93ac3767a 100644 --- a/Libraries/rocAL/image_augmentation/Makefile +++ b/Libraries/rocAL/image_augmentation/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocAL/video/Makefile b/Libraries/rocAL/video/Makefile index c29a454dd..58fa578bd 100644 --- a/Libraries/rocAL/video/Makefile +++ b/Libraries/rocAL/video/Makefile @@ -25,7 +25,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCAL_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/rocal diff --git a/Libraries/rocALUTION/amg/Makefile b/Libraries/rocALUTION/amg/Makefile index a052f680d..728f8bb8e 100644 --- a/Libraries/rocALUTION/amg/Makefile +++ b/Libraries/rocALUTION/amg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/as_precond/Makefile b/Libraries/rocALUTION/as_precond/Makefile index 6996d3727..052bf1b53 100644 --- a/Libraries/rocALUTION/as_precond/Makefile +++ b/Libraries/rocALUTION/as_precond/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/async/Makefile b/Libraries/rocALUTION/async/Makefile index 239c43942..edcf81c74 100644 --- a/Libraries/rocALUTION/async/Makefile +++ b/Libraries/rocALUTION/async/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/benchmark/Makefile b/Libraries/rocALUTION/benchmark/Makefile index 4fc0eef39..703d4d009 100644 --- a/Libraries/rocALUTION/benchmark/Makefile +++ b/Libraries/rocALUTION/benchmark/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/bicgstab/Makefile b/Libraries/rocALUTION/bicgstab/Makefile index 346f75afe..00be86703 100644 --- a/Libraries/rocALUTION/bicgstab/Makefile +++ b/Libraries/rocALUTION/bicgstab/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/block_precond/Makefile b/Libraries/rocALUTION/block_precond/Makefile index 6dc134399..fe414ec14 100644 --- a/Libraries/rocALUTION/block_precond/Makefile +++ b/Libraries/rocALUTION/block_precond/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/cg/Makefile b/Libraries/rocALUTION/cg/Makefile index 44218da15..284790cfc 100644 --- a/Libraries/rocALUTION/cg/Makefile +++ b/Libraries/rocALUTION/cg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/cg_amg/Makefile b/Libraries/rocALUTION/cg_amg/Makefile index c623e47b6..81b22c268 100644 --- a/Libraries/rocALUTION/cg_amg/Makefile +++ b/Libraries/rocALUTION/cg_amg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/cg_rsamg/Makefile b/Libraries/rocALUTION/cg_rsamg/Makefile index 6ce1d4e4f..ae1f9bd5f 100644 --- a/Libraries/rocALUTION/cg_rsamg/Makefile +++ b/Libraries/rocALUTION/cg_rsamg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/cg_saamg/Makefile b/Libraries/rocALUTION/cg_saamg/Makefile index 17c8b613c..e3fea1e6f 100644 --- a/Libraries/rocALUTION/cg_saamg/Makefile +++ b/Libraries/rocALUTION/cg_saamg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/cmk/Makefile b/Libraries/rocALUTION/cmk/Makefile index afc62a047..8a968a1ca 100644 --- a/Libraries/rocALUTION/cmk/Makefile +++ b/Libraries/rocALUTION/cmk/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/complex/Makefile b/Libraries/rocALUTION/complex/Makefile index 2840bcaa5..18382cac1 100644 --- a/Libraries/rocALUTION/complex/Makefile +++ b/Libraries/rocALUTION/complex/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/direct/Makefile b/Libraries/rocALUTION/direct/Makefile index 7ca946e7b..687b3d8ed 100644 --- a/Libraries/rocALUTION/direct/Makefile +++ b/Libraries/rocALUTION/direct/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/fcg/Makefile b/Libraries/rocALUTION/fcg/Makefile index db044adca..04c65c33c 100644 --- a/Libraries/rocALUTION/fcg/Makefile +++ b/Libraries/rocALUTION/fcg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/fgmres/Makefile b/Libraries/rocALUTION/fgmres/Makefile index 1ba9de1e4..228ebe4b1 100644 --- a/Libraries/rocALUTION/fgmres/Makefile +++ b/Libraries/rocALUTION/fgmres/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/fixed_point/Makefile b/Libraries/rocALUTION/fixed_point/Makefile index 50f0c712f..80c206434 100644 --- a/Libraries/rocALUTION/fixed_point/Makefile +++ b/Libraries/rocALUTION/fixed_point/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/gmres/Makefile b/Libraries/rocALUTION/gmres/Makefile index dd15615c6..0283b361f 100644 --- a/Libraries/rocALUTION/gmres/Makefile +++ b/Libraries/rocALUTION/gmres/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/idr/Makefile b/Libraries/rocALUTION/idr/Makefile index 0a09b177a..bc6b0d4b3 100644 --- a/Libraries/rocALUTION/idr/Makefile +++ b/Libraries/rocALUTION/idr/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/itsolve/Makefile b/Libraries/rocALUTION/itsolve/Makefile index 6a7bccdc3..d2fa17797 100644 --- a/Libraries/rocALUTION/itsolve/Makefile +++ b/Libraries/rocALUTION/itsolve/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/key/Makefile b/Libraries/rocALUTION/key/Makefile index 83ef5906a..fa975b348 100644 --- a/Libraries/rocALUTION/key/Makefile +++ b/Libraries/rocALUTION/key/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/me_preconditioner/Makefile b/Libraries/rocALUTION/me_preconditioner/Makefile index 7746f921c..55f0cf9bc 100644 --- a/Libraries/rocALUTION/me_preconditioner/Makefile +++ b/Libraries/rocALUTION/me_preconditioner/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/mixed_precision/Makefile b/Libraries/rocALUTION/mixed_precision/Makefile index 2ec6d96fc..e90bb2335 100644 --- a/Libraries/rocALUTION/mixed_precision/Makefile +++ b/Libraries/rocALUTION/mixed_precision/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/power_method/Makefile b/Libraries/rocALUTION/power_method/Makefile index ffa256fa0..2cd7e4bea 100644 --- a/Libraries/rocALUTION/power_method/Makefile +++ b/Libraries/rocALUTION/power_method/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/sa_amg/Makefile b/Libraries/rocALUTION/sa_amg/Makefile index c228755db..4a6523a70 100644 --- a/Libraries/rocALUTION/sa_amg/Makefile +++ b/Libraries/rocALUTION/sa_amg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/simple_spmv/Makefile b/Libraries/rocALUTION/simple_spmv/Makefile index 0d6e2cd70..091d646e4 100644 --- a/Libraries/rocALUTION/simple_spmv/Makefile +++ b/Libraries/rocALUTION/simple_spmv/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/stencil/Makefile b/Libraries/rocALUTION/stencil/Makefile index 2e628be9b..d06da1460 100644 --- a/Libraries/rocALUTION/stencil/Makefile +++ b/Libraries/rocALUTION/stencil/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/tns/Makefile b/Libraries/rocALUTION/tns/Makefile index b72601ffe..65c62246b 100644 --- a/Libraries/rocALUTION/tns/Makefile +++ b/Libraries/rocALUTION/tns/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/ua_amg/Makefile b/Libraries/rocALUTION/ua_amg/Makefile index 907d6c4f3..39b2da79e 100644 --- a/Libraries/rocALUTION/ua_amg/Makefile +++ b/Libraries/rocALUTION/ua_amg/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocALUTION/var_precond/Makefile b/Libraries/rocALUTION/var_precond/Makefile index 907b66b78..78662a4a5 100644 --- a/Libraries/rocALUTION/var_precond/Makefile +++ b/Libraries/rocALUTION/var_precond/Makefile @@ -31,7 +31,7 @@ endif # Common variables and flags CXX ?= g++ -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) ROCALUTION_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocBLAS/level_1/axpy/Makefile b/Libraries/rocBLAS/level_1/axpy/Makefile index 929a45c97..a72e95eb0 100644 --- a/Libraries/rocBLAS/level_1/axpy/Makefile +++ b/Libraries/rocBLAS/level_1/axpy/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_1/dot/Makefile b/Libraries/rocBLAS/level_1/dot/Makefile index cdf2b511e..233c256a9 100644 --- a/Libraries/rocBLAS/level_1/dot/Makefile +++ b/Libraries/rocBLAS/level_1/dot/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_1/nrm2/Makefile b/Libraries/rocBLAS/level_1/nrm2/Makefile index 1dd136530..8ba6d003a 100644 --- a/Libraries/rocBLAS/level_1/nrm2/Makefile +++ b/Libraries/rocBLAS/level_1/nrm2/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_1/scal/Makefile b/Libraries/rocBLAS/level_1/scal/Makefile index d23156d89..f23bb9180 100644 --- a/Libraries/rocBLAS/level_1/scal/Makefile +++ b/Libraries/rocBLAS/level_1/scal/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_1/swap/Makefile b/Libraries/rocBLAS/level_1/swap/Makefile index a988a47f1..fed537733 100644 --- a/Libraries/rocBLAS/level_1/swap/Makefile +++ b/Libraries/rocBLAS/level_1/swap/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_2/gemv/Makefile b/Libraries/rocBLAS/level_2/gemv/Makefile index 1c6d8b59b..4a2e06341 100644 --- a/Libraries/rocBLAS/level_2/gemv/Makefile +++ b/Libraries/rocBLAS/level_2/gemv/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_2/her/Makefile b/Libraries/rocBLAS/level_2/her/Makefile index cf393b4f5..fb86d02c5 100644 --- a/Libraries/rocBLAS/level_2/her/Makefile +++ b/Libraries/rocBLAS/level_2/her/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_3/gemm/Makefile b/Libraries/rocBLAS/level_3/gemm/Makefile index 689be7292..e98594c29 100644 --- a/Libraries/rocBLAS/level_3/gemm/Makefile +++ b/Libraries/rocBLAS/level_3/gemm/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocBLAS/level_3/gemm_strided_batched/Makefile b/Libraries/rocBLAS/level_3/gemm_strided_batched/Makefile index 2ed3c1095..a4d38e257 100644 --- a/Libraries/rocBLAS/level_3/gemm_strided_batched/Makefile +++ b/Libraries/rocBLAS/level_3/gemm_strided_batched/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocCV/bilateral_filter/Makefile b/Libraries/rocCV/bilateral_filter/Makefile index 16b0521d3..f49da5299 100644 --- a/Libraries/rocCV/bilateral_filter/Makefile +++ b/Libraries/rocCV/bilateral_filter/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/bnd_box/Makefile b/Libraries/rocCV/bnd_box/Makefile index 69ff742c8..433ce01d9 100644 --- a/Libraries/rocCV/bnd_box/Makefile +++ b/Libraries/rocCV/bnd_box/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/center_crop/Makefile b/Libraries/rocCV/center_crop/Makefile index 45da94da3..003e9e61a 100644 --- a/Libraries/rocCV/center_crop/Makefile +++ b/Libraries/rocCV/center_crop/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/composite/Makefile b/Libraries/rocCV/composite/Makefile index 69184cc88..402399f12 100644 --- a/Libraries/rocCV/composite/Makefile +++ b/Libraries/rocCV/composite/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/copy_make_border/Makefile b/Libraries/rocCV/copy_make_border/Makefile index 0f3f204b9..c7eeefe92 100644 --- a/Libraries/rocCV/copy_make_border/Makefile +++ b/Libraries/rocCV/copy_make_border/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/cropandresize/Makefile b/Libraries/rocCV/cropandresize/Makefile index 3aa2c7d32..8276d8000 100644 --- a/Libraries/rocCV/cropandresize/Makefile +++ b/Libraries/rocCV/cropandresize/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/custom_crop/Makefile b/Libraries/rocCV/custom_crop/Makefile index e4a1ec24e..94a2dd912 100644 --- a/Libraries/rocCV/custom_crop/Makefile +++ b/Libraries/rocCV/custom_crop/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/gamma_contrast/Makefile b/Libraries/rocCV/gamma_contrast/Makefile index c48a948da..34d5b22c2 100644 --- a/Libraries/rocCV/gamma_contrast/Makefile +++ b/Libraries/rocCV/gamma_contrast/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/normalize/Makefile b/Libraries/rocCV/normalize/Makefile index 70f026690..a938a430b 100644 --- a/Libraries/rocCV/normalize/Makefile +++ b/Libraries/rocCV/normalize/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocCV/warp_perspective/Makefile b/Libraries/rocCV/warp_perspective/Makefile index 542997824..1f11145f7 100644 --- a/Libraries/rocCV/warp_perspective/Makefile +++ b/Libraries/rocCV/warp_perspective/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv diff --git a/Libraries/rocDecode/rocdec_decode/Makefile b/Libraries/rocDecode/rocdec_decode/Makefile index efd4b8c6d..f06b01616 100644 --- a/Libraries/rocDecode/rocdec_decode/Makefile +++ b/Libraries/rocDecode/rocdec_decode/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCDECODE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocDecode/video_decode/Makefile b/Libraries/rocDecode/video_decode/Makefile index 284e8e6a8..99da825cc 100644 --- a/Libraries/rocDecode/video_decode/Makefile +++ b/Libraries/rocDecode/video_decode/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_batch/Makefile b/Libraries/rocDecode/video_decode_batch/Makefile index aced12a1c..3e3ba9097 100644 --- a/Libraries/rocDecode/video_decode_batch/Makefile +++ b/Libraries/rocDecode/video_decode_batch/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_mem/Makefile b/Libraries/rocDecode/video_decode_mem/Makefile index 050c48f85..728aefb9f 100644 --- a/Libraries/rocDecode/video_decode_mem/Makefile +++ b/Libraries/rocDecode/video_decode_mem/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_multi_files/Makefile b/Libraries/rocDecode/video_decode_multi_files/Makefile index bcd2da706..a983efea7 100644 --- a/Libraries/rocDecode/video_decode_multi_files/Makefile +++ b/Libraries/rocDecode/video_decode_multi_files/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_perf/Makefile b/Libraries/rocDecode/video_decode_perf/Makefile index aa0dbf1a4..67d891f1b 100644 --- a/Libraries/rocDecode/video_decode_perf/Makefile +++ b/Libraries/rocDecode/video_decode_perf/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_pic_files/Makefile b/Libraries/rocDecode/video_decode_pic_files/Makefile index 757238b0f..31ca81af5 100644 --- a/Libraries/rocDecode/video_decode_pic_files/Makefile +++ b/Libraries/rocDecode/video_decode_pic_files/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_raw/Makefile b/Libraries/rocDecode/video_decode_raw/Makefile index 80080dff8..8b3e4c62c 100644 --- a/Libraries/rocDecode/video_decode_raw/Makefile +++ b/Libraries/rocDecode/video_decode_raw/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_decode_rgb/Makefile b/Libraries/rocDecode/video_decode_rgb/Makefile index 5a35ac2d8..648078329 100644 --- a/Libraries/rocDecode/video_decode_rgb/Makefile +++ b/Libraries/rocDecode/video_decode_rgb/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocDecode/video_to_sequence/Makefile b/Libraries/rocDecode/video_to_sequence/Makefile index 9d76e3817..ecbef6233 100644 --- a/Libraries/rocDecode/video_to_sequence/Makefile +++ b/Libraries/rocDecode/video_to_sequence/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocFFT/Makefile b/Libraries/rocFFT/Makefile index 93f42a246..2d46d7653 100644 --- a/Libraries/rocFFT/Makefile +++ b/Libraries/rocFFT/Makefile @@ -21,7 +21,7 @@ # SOFTWARE. # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) EXAMPLES := \ callback \ diff --git a/Libraries/rocFFT/callback/Makefile b/Libraries/rocFFT/callback/Makefile index a8039252a..39632da1b 100644 --- a/Libraries/rocFFT/callback/Makefile +++ b/Libraries/rocFFT/callback/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocFFT/complex_complex/Makefile b/Libraries/rocFFT/complex_complex/Makefile index f5a2318d9..5845b16ae 100644 --- a/Libraries/rocFFT/complex_complex/Makefile +++ b/Libraries/rocFFT/complex_complex/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocFFT/complex_real/Makefile b/Libraries/rocFFT/complex_real/Makefile index 524b2db58..9b073f502 100644 --- a/Libraries/rocFFT/complex_real/Makefile +++ b/Libraries/rocFFT/complex_real/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocFFT/multi_gpu/Makefile b/Libraries/rocFFT/multi_gpu/Makefile index d2fe816af..592b968cb 100644 --- a/Libraries/rocFFT/multi_gpu/Makefile +++ b/Libraries/rocFFT/multi_gpu/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocFFT/real_complex/Makefile b/Libraries/rocFFT/real_complex/Makefile index 23ba06cc0..0194714d8 100644 --- a/Libraries/rocFFT/real_complex/Makefile +++ b/Libraries/rocFFT/real_complex/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCFFT_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocJPEG/rocjpeg_decode/Makefile b/Libraries/rocJPEG/rocjpeg_decode/Makefile index f6af66a8f..0d72da712 100644 --- a/Libraries/rocJPEG/rocjpeg_decode/Makefile +++ b/Libraries/rocJPEG/rocjpeg_decode/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCJPEG_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile b/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile index 7a45a90f3..1ccaff153 100644 --- a/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile +++ b/Libraries/rocJPEG/rocjpeg_decode_batched/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCJPEG_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile b/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile index 11e10f58c..702f828e8 100644 --- a/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile +++ b/Libraries/rocJPEG/rocjpeg_decode_perf/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCJPEG_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocPRIM/block_sum/Makefile b/Libraries/rocPRIM/block_sum/Makefile index 9c4210059..91cf1d93d 100644 --- a/Libraries/rocPRIM/block_sum/Makefile +++ b/Libraries/rocPRIM/block_sum/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPRIM_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocPRIM/device_sum/Makefile b/Libraries/rocPRIM/device_sum/Makefile index b03ec2b02..f202fb1f9 100644 --- a/Libraries/rocPRIM/device_sum/Makefile +++ b/Libraries/rocPRIM/device_sum/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPRIM_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/api_buffered_tracing/Makefile b/Libraries/rocProfiler-SDK/api_buffered_tracing/Makefile index 9d84cb589..50f95b56d 100644 --- a/Libraries/rocProfiler-SDK/api_buffered_tracing/Makefile +++ b/Libraries/rocProfiler-SDK/api_buffered_tracing/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/api_callback_tracing/Makefile b/Libraries/rocProfiler-SDK/api_callback_tracing/Makefile index 1034e3329..0d13d66e3 100644 --- a/Libraries/rocProfiler-SDK/api_callback_tracing/Makefile +++ b/Libraries/rocProfiler-SDK/api_callback_tracing/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile b/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile index 7671d9219..408005e72 100644 --- a/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile +++ b/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/code_object_tracing/Makefile b/Libraries/rocProfiler-SDK/code_object_tracing/Makefile index 0d4a45632..e981af144 100644 --- a/Libraries/rocProfiler-SDK/code_object_tracing/Makefile +++ b/Libraries/rocProfiler-SDK/code_object_tracing/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/counter_collection/buffer/Makefile b/Libraries/rocProfiler-SDK/counter_collection/buffer/Makefile index a3762bea6..a44c1fe81 100644 --- a/Libraries/rocProfiler-SDK/counter_collection/buffer/Makefile +++ b/Libraries/rocProfiler-SDK/counter_collection/buffer/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/counter_collection/buffer_device_serialization/Makefile b/Libraries/rocProfiler-SDK/counter_collection/buffer_device_serialization/Makefile index 34da72322..0ace7a848 100644 --- a/Libraries/rocProfiler-SDK/counter_collection/buffer_device_serialization/Makefile +++ b/Libraries/rocProfiler-SDK/counter_collection/buffer_device_serialization/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/counter_collection/callback/Makefile b/Libraries/rocProfiler-SDK/counter_collection/callback/Makefile index 200a76aef..b9793fb1c 100644 --- a/Libraries/rocProfiler-SDK/counter_collection/callback/Makefile +++ b/Libraries/rocProfiler-SDK/counter_collection/callback/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/counter_collection/device_profiling/Makefile b/Libraries/rocProfiler-SDK/counter_collection/device_profiling/Makefile index c4239d86d..8943a79f0 100644 --- a/Libraries/rocProfiler-SDK/counter_collection/device_profiling/Makefile +++ b/Libraries/rocProfiler-SDK/counter_collection/device_profiling/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/counter_collection/device_profiling_sync/Makefile b/Libraries/rocProfiler-SDK/counter_collection/device_profiling_sync/Makefile index 36d654588..016db952e 100644 --- a/Libraries/rocProfiler-SDK/counter_collection/device_profiling_sync/Makefile +++ b/Libraries/rocProfiler-SDK/counter_collection/device_profiling_sync/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/counter_collection/print_functional_counters/Makefile b/Libraries/rocProfiler-SDK/counter_collection/print_functional_counters/Makefile index f93c02a80..a507b078a 100644 --- a/Libraries/rocProfiler-SDK/counter_collection/print_functional_counters/Makefile +++ b/Libraries/rocProfiler-SDK/counter_collection/print_functional_counters/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/external_correlation_id_request/Makefile b/Libraries/rocProfiler-SDK/external_correlation_id_request/Makefile index c42dd1e7b..7fc8cdbc2 100644 --- a/Libraries/rocProfiler-SDK/external_correlation_id_request/Makefile +++ b/Libraries/rocProfiler-SDK/external_correlation_id_request/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/intercept_table/Makefile b/Libraries/rocProfiler-SDK/intercept_table/Makefile index 44fc1972d..139836f81 100644 --- a/Libraries/rocProfiler-SDK/intercept_table/Makefile +++ b/Libraries/rocProfiler-SDK/intercept_table/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/openmp_target/Makefile b/Libraries/rocProfiler-SDK/openmp_target/Makefile index 1ceae7fbf..5405a38bf 100644 --- a/Libraries/rocProfiler-SDK/openmp_target/Makefile +++ b/Libraries/rocProfiler-SDK/openmp_target/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/pc_sampling/Makefile b/Libraries/rocProfiler-SDK/pc_sampling/Makefile index c8967545d..170247a0a 100644 --- a/Libraries/rocProfiler-SDK/pc_sampling/Makefile +++ b/Libraries/rocProfiler-SDK/pc_sampling/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocProfiler-SDK/thread_trace/Makefile b/Libraries/rocProfiler-SDK/thread_trace/Makefile index bb699a3b1..cb427804c 100644 --- a/Libraries/rocProfiler-SDK/thread_trace/Makefile +++ b/Libraries/rocProfiler-SDK/thread_trace/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocRAND/c_cpp_api/simple_distributions_cpp/Makefile b/Libraries/rocRAND/c_cpp_api/simple_distributions_cpp/Makefile index 7a85dd454..001042f70 100644 --- a/Libraries/rocRAND/c_cpp_api/simple_distributions_cpp/Makefile +++ b/Libraries/rocRAND/c_cpp_api/simple_distributions_cpp/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocRAND/device_api/pseudorandom_generations/Makefile b/Libraries/rocRAND/device_api/pseudorandom_generations/Makefile index 92506e2bb..9d89d7880 100644 --- a/Libraries/rocRAND/device_api/pseudorandom_generations/Makefile +++ b/Libraries/rocRAND/device_api/pseudorandom_generations/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocRAND/device_api/quasirandom_generations/Makefile b/Libraries/rocRAND/device_api/quasirandom_generations/Makefile index d3e6fea89..3e8ad8dd4 100644 --- a/Libraries/rocRAND/device_api/quasirandom_generations/Makefile +++ b/Libraries/rocRAND/device_api/quasirandom_generations/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../../../External GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include diff --git a/Libraries/rocSOLVER/getf2/Makefile b/Libraries/rocSOLVER/getf2/Makefile index 8d9899ec7..d4aa3b318 100644 --- a/Libraries/rocSOLVER/getf2/Makefile +++ b/Libraries/rocSOLVER/getf2/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSOLVER/getri/Makefile b/Libraries/rocSOLVER/getri/Makefile index e1bf51658..b543aba60 100644 --- a/Libraries/rocSOLVER/getri/Makefile +++ b/Libraries/rocSOLVER/getri/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSOLVER/syev/Makefile b/Libraries/rocSOLVER/syev/Makefile index 9446df3d9..fef4f7af7 100644 --- a/Libraries/rocSOLVER/syev/Makefile +++ b/Libraries/rocSOLVER/syev/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSOLVER/syev_batched/Makefile b/Libraries/rocSOLVER/syev_batched/Makefile index f6d091960..4df5f706e 100644 --- a/Libraries/rocSOLVER/syev_batched/Makefile +++ b/Libraries/rocSOLVER/syev_batched/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSOLVER/syev_strided_batched/Makefile b/Libraries/rocSOLVER/syev_strided_batched/Makefile index 5dcf297e4..bb1d247bc 100644 --- a/Libraries/rocSOLVER/syev_strided_batched/Makefile +++ b/Libraries/rocSOLVER/syev_strided_batched/Makefile @@ -30,7 +30,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCBLAS_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_1/axpyi/Makefile b/Libraries/rocSPARSE/level_1/axpyi/Makefile index 171ee98b0..2abd46b78 100644 --- a/Libraries/rocSPARSE/level_1/axpyi/Makefile +++ b/Libraries/rocSPARSE/level_1/axpyi/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_1/doti/Makefile b/Libraries/rocSPARSE/level_1/doti/Makefile index 6b632afb3..dd0e1179a 100644 --- a/Libraries/rocSPARSE/level_1/doti/Makefile +++ b/Libraries/rocSPARSE/level_1/doti/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_1/gthr/Makefile b/Libraries/rocSPARSE/level_1/gthr/Makefile index 79043e0bc..ce5786788 100644 --- a/Libraries/rocSPARSE/level_1/gthr/Makefile +++ b/Libraries/rocSPARSE/level_1/gthr/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_1/roti/Makefile b/Libraries/rocSPARSE/level_1/roti/Makefile index b216989f8..16fc0728a 100644 --- a/Libraries/rocSPARSE/level_1/roti/Makefile +++ b/Libraries/rocSPARSE/level_1/roti/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_1/sctr/Makefile b/Libraries/rocSPARSE/level_1/sctr/Makefile index 88972e8a6..db0468910 100644 --- a/Libraries/rocSPARSE/level_1/sctr/Makefile +++ b/Libraries/rocSPARSE/level_1/sctr/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/bsrmv/Makefile b/Libraries/rocSPARSE/level_2/bsrmv/Makefile index ffaebb32d..af1239661 100644 --- a/Libraries/rocSPARSE/level_2/bsrmv/Makefile +++ b/Libraries/rocSPARSE/level_2/bsrmv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/bsrsv/Makefile b/Libraries/rocSPARSE/level_2/bsrsv/Makefile index 517b15abc..55e1f37ec 100644 --- a/Libraries/rocSPARSE/level_2/bsrsv/Makefile +++ b/Libraries/rocSPARSE/level_2/bsrsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/bsrxmv/Makefile b/Libraries/rocSPARSE/level_2/bsrxmv/Makefile index 8af79e3d4..10c7c2a42 100644 --- a/Libraries/rocSPARSE/level_2/bsrxmv/Makefile +++ b/Libraries/rocSPARSE/level_2/bsrxmv/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/coomv/Makefile b/Libraries/rocSPARSE/level_2/coomv/Makefile index 497dbd3cf..5c7dd9770 100644 --- a/Libraries/rocSPARSE/level_2/coomv/Makefile +++ b/Libraries/rocSPARSE/level_2/coomv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/csritsv/Makefile b/Libraries/rocSPARSE/level_2/csritsv/Makefile index 94e2c67b9..fe8be4c0a 100644 --- a/Libraries/rocSPARSE/level_2/csritsv/Makefile +++ b/Libraries/rocSPARSE/level_2/csritsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/csrmv/Makefile b/Libraries/rocSPARSE/level_2/csrmv/Makefile index c4f313124..cd737dffd 100644 --- a/Libraries/rocSPARSE/level_2/csrmv/Makefile +++ b/Libraries/rocSPARSE/level_2/csrmv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/csrsv/Makefile b/Libraries/rocSPARSE/level_2/csrsv/Makefile index 56b2f201c..4981ca30d 100644 --- a/Libraries/rocSPARSE/level_2/csrsv/Makefile +++ b/Libraries/rocSPARSE/level_2/csrsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/ellmv/Makefile b/Libraries/rocSPARSE/level_2/ellmv/Makefile index 04d01288c..087719145 100644 --- a/Libraries/rocSPARSE/level_2/ellmv/Makefile +++ b/Libraries/rocSPARSE/level_2/ellmv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/gebsrmv/Makefile b/Libraries/rocSPARSE/level_2/gebsrmv/Makefile index 47c5c0558..287b9af77 100644 --- a/Libraries/rocSPARSE/level_2/gebsrmv/Makefile +++ b/Libraries/rocSPARSE/level_2/gebsrmv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/gemvi/Makefile b/Libraries/rocSPARSE/level_2/gemvi/Makefile index 28b458949..29bbeb6e3 100644 --- a/Libraries/rocSPARSE/level_2/gemvi/Makefile +++ b/Libraries/rocSPARSE/level_2/gemvi/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/spitsv/Makefile b/Libraries/rocSPARSE/level_2/spitsv/Makefile index 01216744c..419188d6e 100644 --- a/Libraries/rocSPARSE/level_2/spitsv/Makefile +++ b/Libraries/rocSPARSE/level_2/spitsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/spmv/Makefile b/Libraries/rocSPARSE/level_2/spmv/Makefile index 3bbdcf42d..e03b96cba 100644 --- a/Libraries/rocSPARSE/level_2/spmv/Makefile +++ b/Libraries/rocSPARSE/level_2/spmv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_2/spsv/Makefile b/Libraries/rocSPARSE/level_2/spsv/Makefile index 1383be640..cb5f38b6f 100644 --- a/Libraries/rocSPARSE/level_2/spsv/Makefile +++ b/Libraries/rocSPARSE/level_2/spsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/bsrmm/Makefile b/Libraries/rocSPARSE/level_3/bsrmm/Makefile index 78aec2f0e..90814e1c8 100644 --- a/Libraries/rocSPARSE/level_3/bsrmm/Makefile +++ b/Libraries/rocSPARSE/level_3/bsrmm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/bsrsm/Makefile b/Libraries/rocSPARSE/level_3/bsrsm/Makefile index d87ae0bba..0480d2912 100644 --- a/Libraries/rocSPARSE/level_3/bsrsm/Makefile +++ b/Libraries/rocSPARSE/level_3/bsrsm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/csrmm/Makefile b/Libraries/rocSPARSE/level_3/csrmm/Makefile index 0a8edc452..d6e5a1ce1 100644 --- a/Libraries/rocSPARSE/level_3/csrmm/Makefile +++ b/Libraries/rocSPARSE/level_3/csrmm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/csrsm/Makefile b/Libraries/rocSPARSE/level_3/csrsm/Makefile index bd3665aad..7da63fd4d 100644 --- a/Libraries/rocSPARSE/level_3/csrsm/Makefile +++ b/Libraries/rocSPARSE/level_3/csrsm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/gebsrmm/Makefile b/Libraries/rocSPARSE/level_3/gebsrmm/Makefile index d450c9e8e..fa6fada44 100644 --- a/Libraries/rocSPARSE/level_3/gebsrmm/Makefile +++ b/Libraries/rocSPARSE/level_3/gebsrmm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/gemmi/Makefile b/Libraries/rocSPARSE/level_3/gemmi/Makefile index 65720e32e..730756678 100644 --- a/Libraries/rocSPARSE/level_3/gemmi/Makefile +++ b/Libraries/rocSPARSE/level_3/gemmi/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/sddmm/Makefile b/Libraries/rocSPARSE/level_3/sddmm/Makefile index f625562af..46e2f545b 100644 --- a/Libraries/rocSPARSE/level_3/sddmm/Makefile +++ b/Libraries/rocSPARSE/level_3/sddmm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/spmm/Makefile b/Libraries/rocSPARSE/level_3/spmm/Makefile index f65e7726c..af0c08aad 100644 --- a/Libraries/rocSPARSE/level_3/spmm/Makefile +++ b/Libraries/rocSPARSE/level_3/spmm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/level_3/spsm/Makefile b/Libraries/rocSPARSE/level_3/spsm/Makefile index ba1baaf7c..7fe0fa955 100644 --- a/Libraries/rocSPARSE/level_3/spsm/Makefile +++ b/Libraries/rocSPARSE/level_3/spsm/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/bsric0/Makefile b/Libraries/rocSPARSE/preconditioner/bsric0/Makefile index ac1ac9a40..3da8d92ad 100644 --- a/Libraries/rocSPARSE/preconditioner/bsric0/Makefile +++ b/Libraries/rocSPARSE/preconditioner/bsric0/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/bsrilu0/Makefile b/Libraries/rocSPARSE/preconditioner/bsrilu0/Makefile index d6979343d..42fedcf3f 100644 --- a/Libraries/rocSPARSE/preconditioner/bsrilu0/Makefile +++ b/Libraries/rocSPARSE/preconditioner/bsrilu0/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/csric0/Makefile b/Libraries/rocSPARSE/preconditioner/csric0/Makefile index 9df7cc5dd..8ced19d4a 100644 --- a/Libraries/rocSPARSE/preconditioner/csric0/Makefile +++ b/Libraries/rocSPARSE/preconditioner/csric0/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/csrilu0/Makefile b/Libraries/rocSPARSE/preconditioner/csrilu0/Makefile index d496c1df8..3a9f226ed 100644 --- a/Libraries/rocSPARSE/preconditioner/csrilu0/Makefile +++ b/Libraries/rocSPARSE/preconditioner/csrilu0/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/csritilu0/Makefile b/Libraries/rocSPARSE/preconditioner/csritilu0/Makefile index 2d7934606..5a212254e 100644 --- a/Libraries/rocSPARSE/preconditioner/csritilu0/Makefile +++ b/Libraries/rocSPARSE/preconditioner/csritilu0/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/gpsv/Makefile b/Libraries/rocSPARSE/preconditioner/gpsv/Makefile index 0e8e9b16a..f1aafe61d 100644 --- a/Libraries/rocSPARSE/preconditioner/gpsv/Makefile +++ b/Libraries/rocSPARSE/preconditioner/gpsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocSPARSE/preconditioner/gtsv/Makefile b/Libraries/rocSPARSE/preconditioner/gtsv/Makefile index a349c6759..abab7a574 100644 --- a/Libraries/rocSPARSE/preconditioner/gtsv/Makefile +++ b/Libraries/rocSPARSE/preconditioner/gtsv/Makefile @@ -28,7 +28,7 @@ ifneq ($(GPU_RUNTIME), HIP) $(error GPU_RUNTIME is set to "$(GPU_RUNTIME)". GPU_RUNTIME must be HIP.) endif -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCSPARSE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocThrust/device_ptr/Makefile b/Libraries/rocThrust/device_ptr/Makefile index 455c6f83a..e1aeef06c 100644 --- a/Libraries/rocThrust/device_ptr/Makefile +++ b/Libraries/rocThrust/device_ptr/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCTHRUST_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocThrust/norm/Makefile b/Libraries/rocThrust/norm/Makefile index d0ffebbf5..322e59d92 100644 --- a/Libraries/rocThrust/norm/Makefile +++ b/Libraries/rocThrust/norm/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCTHRUST_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocThrust/reduce_sum/Makefile b/Libraries/rocThrust/reduce_sum/Makefile index 3fccb1d98..601f98eda 100644 --- a/Libraries/rocThrust/reduce_sum/Makefile +++ b/Libraries/rocThrust/reduce_sum/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCTHRUST_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocThrust/remove_points/Makefile b/Libraries/rocThrust/remove_points/Makefile index 3accd1e7a..0e36d6407 100644 --- a/Libraries/rocThrust/remove_points/Makefile +++ b/Libraries/rocThrust/remove_points/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCTHRUST_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocThrust/saxpy/Makefile b/Libraries/rocThrust/saxpy/Makefile index a3033c055..32b23faa3 100644 --- a/Libraries/rocThrust/saxpy/Makefile +++ b/Libraries/rocThrust/saxpy/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCTHRUST_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocThrust/vectors/Makefile b/Libraries/rocThrust/vectors/Makefile index 9bd6da135..e2142a3b7 100644 --- a/Libraries/rocThrust/vectors/Makefile +++ b/Libraries/rocThrust/vectors/Makefile @@ -29,7 +29,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCTHRUST_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/hiprtc_gemm/Makefile b/Libraries/rocWMMA/hiprtc_gemm/Makefile index 536306e54..3425ecfbe 100644 --- a/Libraries/rocWMMA/hiprtc_gemm/Makefile +++ b/Libraries/rocWMMA/hiprtc_gemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/perf_dgemm/Makefile b/Libraries/rocWMMA/perf_dgemm/Makefile index 09f691980..2255ba223 100644 --- a/Libraries/rocWMMA/perf_dgemm/Makefile +++ b/Libraries/rocWMMA/perf_dgemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/perf_hgemm/Makefile b/Libraries/rocWMMA/perf_hgemm/Makefile index 6f2c68b29..3f9f61557 100644 --- a/Libraries/rocWMMA/perf_hgemm/Makefile +++ b/Libraries/rocWMMA/perf_hgemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/perf_i8gemm/Makefile b/Libraries/rocWMMA/perf_i8gemm/Makefile index 9470d6869..11f0477b2 100644 --- a/Libraries/rocWMMA/perf_i8gemm/Makefile +++ b/Libraries/rocWMMA/perf_i8gemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/perf_sgemm/Makefile b/Libraries/rocWMMA/perf_sgemm/Makefile index 8c3ec3fde..b1a618ddd 100644 --- a/Libraries/rocWMMA/perf_sgemm/Makefile +++ b/Libraries/rocWMMA/perf_sgemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/simple_dgemm/Makefile b/Libraries/rocWMMA/simple_dgemm/Makefile index 3398a98d6..59ec4a990 100644 --- a/Libraries/rocWMMA/simple_dgemm/Makefile +++ b/Libraries/rocWMMA/simple_dgemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/simple_dgemv/Makefile b/Libraries/rocWMMA/simple_dgemv/Makefile index bed5e1044..5f768cf84 100644 --- a/Libraries/rocWMMA/simple_dgemv/Makefile +++ b/Libraries/rocWMMA/simple_dgemv/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/simple_dlrm/Makefile b/Libraries/rocWMMA/simple_dlrm/Makefile index 9b4bd7714..d58096844 100644 --- a/Libraries/rocWMMA/simple_dlrm/Makefile +++ b/Libraries/rocWMMA/simple_dlrm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/simple_hgemm/Makefile b/Libraries/rocWMMA/simple_hgemm/Makefile index 223619f6d..7feb58e7d 100644 --- a/Libraries/rocWMMA/simple_hgemm/Makefile +++ b/Libraries/rocWMMA/simple_hgemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/simple_sgemm/Makefile b/Libraries/rocWMMA/simple_sgemm/Makefile index 3ee39b5dd..a7e420653 100644 --- a/Libraries/rocWMMA/simple_sgemm/Makefile +++ b/Libraries/rocWMMA/simple_sgemm/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Libraries/rocWMMA/simple_sgemv/Makefile b/Libraries/rocWMMA/simple_sgemv/Makefile index 110b09d43..bbe116f75 100644 --- a/Libraries/rocWMMA/simple_sgemv/Makefile +++ b/Libraries/rocWMMA/simple_sgemv/Makefile @@ -33,7 +33,7 @@ ifneq ($(GPU_RUNTIME), HIP) endif # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCWMMA_INCLUDE_DIR := $(HIP_INCLUDE_DIR) diff --git a/Programming-Guide/Tutorials/Performance-Optimization/basic_image_gamma_correction/Makefile b/Programming-Guide/Tutorials/Performance-Optimization/basic_image_gamma_correction/Makefile index f932474b1..8252e943b 100644 --- a/Programming-Guide/Tutorials/Performance-Optimization/basic_image_gamma_correction/Makefile +++ b/Programming-Guide/Tutorials/Performance-Optimization/basic_image_gamma_correction/Makefile @@ -24,7 +24,7 @@ EXAMPLE := programming_guide_basic_image_gamma_correction GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Programming-Guide/Tutorials/Performance-Optimization/grid_stride_image_gamma_correction/Makefile b/Programming-Guide/Tutorials/Performance-Optimization/grid_stride_image_gamma_correction/Makefile index db325847b..d4b804ded 100644 --- a/Programming-Guide/Tutorials/Performance-Optimization/grid_stride_image_gamma_correction/Makefile +++ b/Programming-Guide/Tutorials/Performance-Optimization/grid_stride_image_gamma_correction/Makefile @@ -24,7 +24,7 @@ EXAMPLE := programming_guide_grid_stride_image_gamma_correction GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_multiply/Makefile b/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_multiply/Makefile index a25beb935..a56f6915a 100644 --- a/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_multiply/Makefile +++ b/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_multiply/Makefile @@ -24,7 +24,7 @@ EXAMPLE := programming_guide_tiling_matrix_multiply GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_transpose/Makefile b/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_transpose/Makefile index f65c851c9..a2e245a39 100644 --- a/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_transpose/Makefile +++ b/Programming-Guide/Tutorials/Performance-Optimization/tiling_matrix_transpose/Makefile @@ -24,7 +24,7 @@ EXAMPLE := programming_guide_tiling_matrix_transpose GPU_RUNTIME ?= HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Tools/ROCgdb/Makefile b/Tools/ROCgdb/Makefile index 2d725b73b..6be3f3cfe 100644 --- a/Tools/ROCgdb/Makefile +++ b/Tools/ROCgdb/Makefile @@ -26,7 +26,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Tools/rocprof-compute/Makefile b/Tools/rocprof-compute/Makefile index 9dd58087b..3b4c33720 100644 --- a/Tools/rocprof-compute/Makefile +++ b/Tools/rocprof-compute/Makefile @@ -24,7 +24,7 @@ EXAMPLE := rocprof-compute-occupancy GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Tools/rocprof-systems/Makefile b/Tools/rocprof-systems/Makefile index 79ad9c032..19dd9d60a 100644 --- a/Tools/rocprof-systems/Makefile +++ b/Tools/rocprof-systems/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME = HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc diff --git a/Tools/rocprofv3/Makefile b/Tools/rocprofv3/Makefile index c19c6ca90..a494a1d85 100644 --- a/Tools/rocprofv3/Makefile +++ b/Tools/rocprofv3/Makefile @@ -27,7 +27,7 @@ EXTERNAL_DIR := ../../External GPU_RUNTIME := HIP # HIP variables -ROCM_INSTALL_DIR ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc From d27b74268f3edd01b091c7a1172684de3f606fdb Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 17 Mar 2026 10:32:41 -0400 Subject: [PATCH 05/36] fix make command --- .../workflows/build-rocm-examples-reusable.yml | 2 +- .../hip_template_warp_size_reduction | Bin 0 -> 52008 bytes .../warp_size_reduction/hip_warp_size_reduction | Bin 0 -> 41968 bytes .../hip_calling_global_functions | Bin 0 -> 38576 bytes .../Tutorials/Programming-Patterns/bfs/graphgen | Bin 0 -> 26584 bytes Tools/ROCgdb/rocgdb-matmul | Bin 0 -> 58288 bytes 6 files changed, 1 insertion(+), 1 deletion(-) create mode 100755 HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/hip_template_warp_size_reduction create mode 100755 HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/hip_warp_size_reduction create mode 100755 HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/hip_calling_global_functions create mode 100755 HIP-Doc/Tutorials/Programming-Patterns/bfs/graphgen create mode 100755 Tools/ROCgdb/rocgdb-matmul diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index e78b86ea4..37abd99b6 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -222,7 +222,7 @@ jobs: - name: Makefile build if: ${{ !cancelled() }} run: | - make -j ROCM_INSTALL_DIR="${ROCM_PATH}" CXXFLAGS="--offload-arch=${{ matrix.gpu_config.gpu_target }}" + make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" - name: Clean the workspace if: always() diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/hip_template_warp_size_reduction b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/hip_template_warp_size_reduction new file mode 100755 index 0000000000000000000000000000000000000000..175fabe96994e79ece5393fc582a415a3d44d1c5 GIT binary patch literal 52008 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 z z{GOExkJ=;TmrF(glk@)*(Dmudb-+cPnm{$4-}E6l{YMc=@_2mWL9X{~UZdfaXNw2{ zl8VoM4Z2=lzCSqhQ%wLX3<)7Q|IZ*+FE8IWVdMf%lA2`0;rN4!4&<@*$#R6aFqgk4GXU(TsRmkE%k zB#MVf{7%ZxNJ?L#5>CcVQW9K#(JwWHc_PE)XXsDnU$(2WAunyONod!`EgGcXj?srC VlwFuc{_dwVsas{k5lWKf|3C8OxZ?l- literal 0 HcmV?d00001 diff --git a/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/hip_warp_size_reduction b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/hip_warp_size_reduction new file mode 100755 index 0000000000000000000000000000000000000000..4bfc082f9c89e8e0f62a5281f9b83b342cd472ff GIT binary patch literal 41968 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
|Q4E?|W literal 0 HcmV?d00001 diff --git a/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/hip_calling_global_functions b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/hip_calling_global_functions new file mode 100755 index 0000000000000000000000000000000000000000..4bf118fb2fa77c961073e50d41722ea8a1c79289 GIT binary patch literal 38576 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 literal 0 HcmV?d00001 diff --git a/HIP-Doc/Tutorials/Programming-Patterns/bfs/graphgen b/HIP-Doc/Tutorials/Programming-Patterns/bfs/graphgen new file mode 100755 index 0000000000000000000000000000000000000000..73a1375c77cce49d763fc43b5ead061be1d935ab GIT binary patch literal 26584 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 Pn{)~JcVtpNUH^XoQLwNK literal 0 HcmV?d00001 diff --git a/Tools/ROCgdb/rocgdb-matmul b/Tools/ROCgdb/rocgdb-matmul new file mode 100755 index 0000000000000000000000000000000000000000..d302020210646e507fae84bb5f0a3374817f3e0d GIT binary patch literal 58288 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 b*q+iZD`i0 Date: Tue, 17 Mar 2026 18:41:16 +0000 Subject: [PATCH 06/36] Skip optional libraries in Makefile build when headers are missing The Makefile build unconditionally tried to compile all libraries, failing when optional dependencies (rocALUTION, MIVisionX, rocAL, hipTensor, MIGraphX, rocCV) aren't installed in the CI environment. Add wildcard header checks to mirror the CMake find_package() behavior. Co-Authored-By: Claude Opus 4.6 --- Libraries/Makefile | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/Libraries/Makefile b/Libraries/Makefile index f8d6ae443..c757bc0fa 100644 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -31,16 +31,14 @@ LIBRARIES := \ hipRAND ifneq ($(GPU_RUNTIME), CUDA) + +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) +INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include + LIBRARIES += \ hipBLASLt \ - hipTensor \ - MIGraphX \ - MIVisionX \ RCCL \ - rocAL \ - rocALUTION \ rocBLAS \ - rocCV \ rocDecode \ rocFFT \ rocJPEG \ @@ -51,6 +49,32 @@ LIBRARIES += \ rocThrust \ rocWMMA \ RPP + +# Only build libraries whose headers are present +ifneq ($(wildcard $(INCLUDE_DIR)/hiptensor/hiptensor.hpp),) +LIBRARIES += hipTensor +endif + +ifneq ($(wildcard $(INCLUDE_DIR)/migraphx/migraphx.hpp),) +LIBRARIES += MIGraphX +endif + +ifneq ($(wildcard $(INCLUDE_DIR)/mivisionx/VX/vx.h),) +LIBRARIES += MIVisionX +endif + +ifneq ($(wildcard $(INCLUDE_DIR)/rocal/rocal_api.h),) +LIBRARIES += rocAL +endif + +ifneq ($(wildcard $(INCLUDE_DIR)/rocalution/rocalution.hpp),) +LIBRARIES += rocALUTION +endif + +ifneq ($(wildcard $(INCLUDE_DIR)/roccv/core/tensor.hpp),) +LIBRARIES += rocCV +endif + endif all: $(LIBRARIES) From ca513dd5fc9e0cc35b84c83e9b382cec0f749df8 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 17 Mar 2026 18:46:25 +0000 Subject: [PATCH 07/36] Move Makefile build step before CMake in CI workflow Co-Authored-By: Claude Opus 4.6 --- .../workflows/build-rocm-examples-reusable.yml | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 2b94e4899..33cd01309 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -107,7 +107,12 @@ jobs: echo "LD_LIBRARY_PATH=${ROCM_PATH}/lib:${ROCM_PATH}/llvm/lib:${ROCM_PATH}/lib/rocprofiler-systems" >> $GITHUB_ENV echo "ENABLE_OPENMP=ON" >> $GITHUB_ENV + - name: Makefile build + run: | + make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" + - name: CMake configure + if: ${{ !cancelled() }} run: | cmake -S . -B build -DCMAKE_HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" -DROCM_ROOT="${ROCM_PATH}" -DCMAKE_BUILD_RPATH="${ROCM_PATH}/lib" -DROCM_EXAMPLES_ENABLE_OPENMP="${ENABLE_OPENMP}" 2> >(tee cmake_error.log >&2) @@ -143,17 +148,19 @@ jobs: fi - name: CMake build + if: ${{ !cancelled() }} run: | cmake --build build -j - name: Upload build artifacts - if: success() + if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: name: rocm-examples-build-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} path: build/ - name: Run tests + if: ${{ !cancelled() }} run: | python3 .github/build_tools/generate_skip_tests.py --target ${{ matrix.gpu_config.gpu_target }} --distro ${{ inputs.distro }} @@ -198,7 +205,7 @@ jobs: echo "
Failed tests output" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY - + awk ' /^[0-9]+\/[0-9]+ Testing: / { if (inblock && failed) print block; block = $0; inblock = 1; failed = 0; seen_result = 0; next } inblock { block = block "\n" $0 } @@ -207,7 +214,7 @@ jobs: /^-+$/ { if (inblock && seen_result) { if (failed) print block; inblock = 0 } } END { if (inblock && failed) print block } ' "${LAST_TEST_LOG}" >> $GITHUB_STEP_SUMMARY - + echo '```' >> $GITHUB_STEP_SUMMARY echo "
" >> $GITHUB_STEP_SUMMARY fi @@ -219,11 +226,6 @@ jobs: name: ctest-logs-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} path: build/Testing/Temporary/ - - name: Makefile build - if: ${{ !cancelled() }} - run: | - make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" - - name: Clean the workspace if: always() run: find "$GITHUB_WORKSPACE" -mindepth 1 -delete From c74de5c5e08364f2aea0bb41a1b11448ecae1071 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 17 Mar 2026 18:53:34 +0000 Subject: [PATCH 08/36] Fix additional Makefile build failures: RPP and openmp_target - Add RPP to conditional header checks (rpp/rpp.h missing in wheel env) - Skip rocProfiler-SDK openmp_target example when ENABLE_OPENMP=OFF (wheel installs lack amdllvm needed for OpenMP offloading) Co-Authored-By: Claude Opus 4.6 --- Libraries/Makefile | 7 +++++-- Libraries/rocProfiler-SDK/Makefile | 5 ++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Libraries/Makefile b/Libraries/Makefile index c757bc0fa..50c5ea8ad 100644 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -47,8 +47,7 @@ LIBRARIES += \ rocSOLVER \ rocSPARSE \ rocThrust \ - rocWMMA \ - RPP + rocWMMA # Only build libraries whose headers are present ifneq ($(wildcard $(INCLUDE_DIR)/hiptensor/hiptensor.hpp),) @@ -75,6 +74,10 @@ ifneq ($(wildcard $(INCLUDE_DIR)/roccv/core/tensor.hpp),) LIBRARIES += rocCV endif +ifneq ($(wildcard $(INCLUDE_DIR)/rpp/rpp.h),) +LIBRARIES += RPP +endif + endif all: $(LIBRARIES) diff --git a/Libraries/rocProfiler-SDK/Makefile b/Libraries/rocProfiler-SDK/Makefile index 75cc0bd74..38485d36b 100644 --- a/Libraries/rocProfiler-SDK/Makefile +++ b/Libraries/rocProfiler-SDK/Makefile @@ -28,9 +28,12 @@ EXAMPLES := \ counter_collection \ external_correlation_id_request \ intercept_table \ - openmp_target \ pc_sampling +ifneq ($(ENABLE_OPENMP), OFF) +EXAMPLES += openmp_target +endif + all: $(EXAMPLES) clean: TARGET=clean From c66e072fd4a913dc1bf594d6e9baf173d1c24489 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Wed, 18 Mar 2026 17:30:49 +0000 Subject: [PATCH 09/36] Fix Makefile CI: target correct GPU arch and guard openmp_target Set HIPCC_COMPILE_FLAGS_APPEND env var in CI to ensure all hipcc compilations target the correct GPU architecture. This fixes ~370 leaf Makefiles that don't pass --offload-arch, without affecting g++/amdclang++ examples since only hipcc reads this env var. Guard openmp_target behind an amdclang++ existence check so tarball installs that lack amdclang++ don't fail the Makefile build. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/build-rocm-examples-reusable.yml | 2 ++ Libraries/rocProfiler-SDK/Makefile | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 33cd01309..dc0717335 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -75,6 +75,7 @@ jobs: echo "PATH=${ROCM_PATH}/bin:${ROCM_PATH}/llvm/bin:${PATH}" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=${ROCM_PATH}/lib:${ROCM_PATH}/llvm/lib:${ROCM_PATH}/lib/rocprofiler-systems" >> $GITHUB_ENV echo "ENABLE_OPENMP=OFF" >> $GITHUB_ENV + echo "HIPCC_COMPILE_FLAGS_APPEND=--offload-arch=${{ matrix.gpu_config.gpu_target }}" >> $GITHUB_ENV - name: Install TheRock tarball if: ${{ matrix.install_method == 'tarball' }} @@ -106,6 +107,7 @@ jobs: echo "PATH=${ROCM_PATH}/bin:${ROCM_PATH}/llvm/bin:${PATH}" >> $GITHUB_ENV echo "LD_LIBRARY_PATH=${ROCM_PATH}/lib:${ROCM_PATH}/llvm/lib:${ROCM_PATH}/lib/rocprofiler-systems" >> $GITHUB_ENV echo "ENABLE_OPENMP=ON" >> $GITHUB_ENV + echo "HIPCC_COMPILE_FLAGS_APPEND=--offload-arch=${{ matrix.gpu_config.gpu_target }}" >> $GITHUB_ENV - name: Makefile build run: | diff --git a/Libraries/rocProfiler-SDK/Makefile b/Libraries/rocProfiler-SDK/Makefile index 38485d36b..58e465dda 100644 --- a/Libraries/rocProfiler-SDK/Makefile +++ b/Libraries/rocProfiler-SDK/Makefile @@ -31,7 +31,10 @@ EXAMPLES := \ pc_sampling ifneq ($(ENABLE_OPENMP), OFF) -EXAMPLES += openmp_target + _ROCM_DIR := $(or $(ROCM_PATH),/opt/rocm) + ifneq ($(wildcard $(_ROCM_DIR)/bin/amdclang++),) + EXAMPLES += openmp_target + endif endif all: $(EXAMPLES) From eb08d6daf5f1282ecd9d8f1ae26dda8d9c767e18 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Wed, 18 Mar 2026 22:33:02 +0000 Subject: [PATCH 10/36] Guard optional Makefile examples behind dependency checks Skip opengl_interop, vulkan_interop, and sobel_filter when glfw3/vulkan pkg-config packages are not available. Guard rocDecode and rocJPEG behind header existence checks, matching the pattern used for other optional libraries like hipTensor, MIGraphX, and rocAL. Co-Authored-By: Claude Opus 4.6 --- Applications/Makefile | 7 +++++-- HIP-Basic/Makefile | 9 +++++++-- Libraries/Makefile | 10 ++++++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/Applications/Makefile b/Applications/Makefile index 0fa70928d..427dbcc2d 100644 --- a/Applications/Makefile +++ b/Applications/Makefile @@ -26,8 +26,11 @@ EXAMPLES := \ fdtd \ floyd_warshall \ histogram \ - prefix_sum \ - sobel_filter + prefix_sum + +ifneq ($(shell pkg-config --exists glfw3 2>/dev/null && echo yes),) + EXAMPLES += sobel_filter +endif ifneq ($(GPU_RUNTIME), CUDA) EXAMPLES += \ diff --git a/HIP-Basic/Makefile b/HIP-Basic/Makefile index 95606788e..7318ac23a 100644 --- a/HIP-Basic/Makefile +++ b/HIP-Basic/Makefile @@ -36,16 +36,21 @@ EXAMPLES := \ moving_average \ multi_gpu_data_transfer \ occupancy \ - opengl_interop \ runtime_compilation \ saxpy \ shared_memory \ streams \ static_host_library \ texture_management \ - vulkan_interop \ warp_shuffle +ifneq ($(shell pkg-config --exists glfw3 2>/dev/null && echo yes),) + EXAMPLES += opengl_interop + ifneq ($(shell pkg-config --exists vulkan 2>/dev/null && echo yes),) + EXAMPLES += vulkan_interop + endif +endif + # Only supported on HIP (not CUDA). ifneq ($(GPU_RUNTIME), CUDA) EXAMPLES += \ diff --git a/Libraries/Makefile b/Libraries/Makefile index 50c5ea8ad..8133663d4 100644 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -39,9 +39,7 @@ LIBRARIES += \ hipBLASLt \ RCCL \ rocBLAS \ - rocDecode \ rocFFT \ - rocJPEG \ rocPRIM \ rocProfiler-SDK \ rocSOLVER \ @@ -49,6 +47,14 @@ LIBRARIES += \ rocThrust \ rocWMMA +ifneq ($(wildcard $(INCLUDE_DIR)/rocdecode/rocdecode.h),) +LIBRARIES += rocDecode +endif + +ifneq ($(wildcard $(INCLUDE_DIR)/rocjpeg/rocjpeg.h),) +LIBRARIES += rocJPEG +endif + # Only build libraries whose headers are present ifneq ($(wildcard $(INCLUDE_DIR)/hiptensor/hiptensor.hpp),) LIBRARIES += hipTensor From 0dcca6824e7d5d7edbed831bf08c07409929448a Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Thu, 19 Mar 2026 19:05:05 +0000 Subject: [PATCH 11/36] Fix Makefile CI: replace pkg-config checks with wildcard header checks pkg-config is not installed in SLES and AlmaLinux CI containers, causing make to exit with code 2. Use $(wildcard ...) header detection instead, matching the pattern already used in Libraries/Makefile. Co-Authored-By: Claude Opus 4.6 --- Applications/Makefile | 2 +- HIP-Basic/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Applications/Makefile b/Applications/Makefile index 427dbcc2d..a0dedbfaa 100644 --- a/Applications/Makefile +++ b/Applications/Makefile @@ -28,7 +28,7 @@ EXAMPLES := \ histogram \ prefix_sum -ifneq ($(shell pkg-config --exists glfw3 2>/dev/null && echo yes),) +ifneq ($(wildcard /usr/include/GLFW/glfw3.h),) EXAMPLES += sobel_filter endif diff --git a/HIP-Basic/Makefile b/HIP-Basic/Makefile index 7318ac23a..9f83aaff1 100644 --- a/HIP-Basic/Makefile +++ b/HIP-Basic/Makefile @@ -44,9 +44,9 @@ EXAMPLES := \ texture_management \ warp_shuffle -ifneq ($(shell pkg-config --exists glfw3 2>/dev/null && echo yes),) +ifneq ($(wildcard /usr/include/GLFW/glfw3.h),) EXAMPLES += opengl_interop - ifneq ($(shell pkg-config --exists vulkan 2>/dev/null && echo yes),) + ifneq ($(wildcard /usr/include/vulkan/vulkan.h),) EXAMPLES += vulkan_interop endif endif From 7ca427c7e57d44868b6d91a8e0cab8c11723d8be Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Thu, 19 Mar 2026 19:16:43 +0000 Subject: [PATCH 12/36] Fix Makefile CI: guard rocDecode behind FFmpeg check, fix pthread link MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two failures in the Makefile build step: 1. rocDecode examples link against FFmpeg (-lavcodec, -lavformat, -lavutil) which is not installed in CI containers. The rocdecode header check alone is insufficient — also check for FFmpeg headers before including rocDecode in the build. 2. rocProfiler-SDK/code_object_tracing fails with undefined symbol pthread_join — add missing -lpthread to the link command. Co-Authored-By: Claude Opus 4.6 --- Libraries/Makefile | 2 ++ Libraries/rocProfiler-SDK/code_object_tracing/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Libraries/Makefile b/Libraries/Makefile index 8133663d4..4e9d9df70 100644 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -48,8 +48,10 @@ LIBRARIES += \ rocWMMA ifneq ($(wildcard $(INCLUDE_DIR)/rocdecode/rocdecode.h),) +ifneq ($(wildcard /usr/include/libavcodec/avcodec.h),) LIBRARIES += rocDecode endif +endif ifneq ($(wildcard $(INCLUDE_DIR)/rocjpeg/rocjpeg.h),) LIBRARIES += rocJPEG diff --git a/Libraries/rocProfiler-SDK/code_object_tracing/Makefile b/Libraries/rocProfiler-SDK/code_object_tracing/Makefile index e981af144..dca9c5789 100644 --- a/Libraries/rocProfiler-SDK/code_object_tracing/Makefile +++ b/Libraries/rocProfiler-SDK/code_object_tracing/Makefile @@ -60,7 +60,7 @@ $(CLIENT_LIB): client.cpp $(COMMON_INCLUDE_DIR)/rocprofiler_utils.hpp $(COMPILER) $(ICXXFLAGS) $(ICPPFLAGS) -fPIC -shared -o $@ $< $(ILDFLAGS) $(ILDLIBS) $(EXAMPLE): $(CLIENT_LIB) main.cpp - $(COMPILER) $(ICXXFLAGS) $(ICPPFLAGS) $(ILDFLAGS) -o $@ main.cpp -L. -l$(EXAMPLE)_client -Wl,-rpath,'$$ORIGIN' + $(COMPILER) $(ICXXFLAGS) $(ICPPFLAGS) $(ILDFLAGS) -o $@ main.cpp -L. -l$(EXAMPLE)_client -Wl,-rpath,'$$ORIGIN' -lpthread clean: $(RM) $(EXAMPLE) $(CLIENT_LIB) From ef252937139cfb215418956bebce469c7467b2d8 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Thu, 19 Mar 2026 22:06:44 +0000 Subject: [PATCH 13/36] Add configure phase and Makefile test runner to CI Add configure.sh and Common/require_deps.mk to detect external dependencies (FFmpeg, OpenCV, GLFW3, Vulkan, glslangValidator) before build. Each leaf Makefile declares REQUIRED_DEPS and cleanly skips when dependencies are missing, preventing link-time failures in CI. - configure.sh: probes deps via pkg-config with fallbacks, writes config.mk - require_deps.mk: checks REQUIRED_DEPS, sets SKIP_BUILD=1 if unmet - run_makefile_tests.sh: finds and runs Makefile-built executables with timeout and skip-file support - Update 27 leaf Makefiles (rocDecode, rocCV, RPP, opengl/vulkan_interop, sobel_filter) to use the new dependency gating - Remove FFmpeg guard from Libraries/Makefile (let leaves decide) - Update CI workflow: run configure.sh before make, run Makefile tests before CMake build - Fix rocProfiler-SDK/code_object_tracing: add -lpthread to ILDLIBS Co-Authored-By: Claude Opus 4.6 --- .../build-rocm-examples-reusable.yml | 8 + .gitignore | 1 + Applications/sobel_filter/Makefile | 16 +- Common/require_deps.mk | 118 ++++++++++++ HIP-Basic/opengl_interop/Makefile | 16 +- HIP-Basic/vulkan_interop/Makefile | 16 +- Libraries/Makefile | 2 - Libraries/RPP/box_filter/Makefile | 14 +- Libraries/RPP/brightness/Makefile | 14 +- Libraries/RPP/contrast/Makefile | 14 +- Libraries/RPP/flip/Makefile | 14 +- Libraries/RPP/gamma_correction/Makefile | 14 +- Libraries/RPP/resize/Makefile | 14 +- Libraries/rocCV/bilateral_filter/Makefile | 16 +- Libraries/rocCV/bnd_box/Makefile | 16 +- Libraries/rocCV/center_crop/Makefile | 16 +- Libraries/rocCV/composite/Makefile | 16 +- Libraries/rocCV/copy_make_border/Makefile | 16 +- Libraries/rocCV/cropandresize/Makefile | 16 +- Libraries/rocCV/custom_crop/Makefile | 16 +- Libraries/rocCV/gamma_contrast/Makefile | 16 +- Libraries/rocCV/normalize/Makefile | 16 +- Libraries/rocCV/warp_perspective/Makefile | 16 +- Libraries/rocDecode/video_decode/Makefile | 12 ++ .../rocDecode/video_decode_batch/Makefile | 12 ++ Libraries/rocDecode/video_decode_mem/Makefile | 12 ++ .../video_decode_multi_files/Makefile | 12 ++ .../rocDecode/video_decode_perf/Makefile | 12 ++ .../rocDecode/video_decode_pic_files/Makefile | 12 ++ Libraries/rocDecode/video_decode_rgb/Makefile | 12 ++ .../rocDecode/video_to_sequence/Makefile | 12 ++ .../code_object_tracing/Makefile | 2 +- Makefile | 5 +- configure.sh | 169 ++++++++++++++++++ run_makefile_tests.sh | 132 ++++++++++++++ 35 files changed, 789 insertions(+), 36 deletions(-) create mode 100644 Common/require_deps.mk create mode 100755 configure.sh create mode 100755 run_makefile_tests.sh diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index dc0717335..3a8116f4e 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -111,8 +111,16 @@ jobs: - name: Makefile build run: | + ./configure.sh --rocm-path="${ROCM_PATH}" make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" + - name: Makefile tests + if: ${{ !cancelled() }} + run: | + python3 .github/build_tools/generate_skip_tests.py --target ${{ matrix.gpu_config.gpu_target }} --distro ${{ inputs.distro }} + SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" + ./run_makefile_tests.sh --skip-file="${SKIP_FILE}" --timeout=120 + - name: CMake configure if: ${{ !cancelled() }} run: | diff --git a/.gitignore b/.gitignore index 6c015456b..b44f3447c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ *.pdb CMakeUserPresets.json .cline_storage +config.mk diff --git a/Applications/sobel_filter/Makefile b/Applications/sobel_filter/Makefile index 0205fdb0e..35fbcc63a 100644 --- a/Applications/sobel_filter/Makefile +++ b/Applications/sobel_filter/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../Common EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP +# Dependency checking +REQUIRED_DEPS := GLFW3 +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include @@ -34,9 +40,9 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -ICPPFLAGS := -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) $(shell pkg-config --cflags glfw3) +ICPPFLAGS := -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) $(GLFW3_CFLAGS) ILDFLAGS := -ILDLIBS := $(shell pkg-config --libs glfw3) -ldl +ILDLIBS := $(GLFW3_LIBS) -ldl ifeq ($(GPU_RUNTIME), CUDA) ICXXFLAGS += -x cu @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Common/require_deps.mk b/Common/require_deps.mk new file mode 100644 index 000000000..11674b37d --- /dev/null +++ b/Common/require_deps.mk @@ -0,0 +1,118 @@ +# MIT License +# +# Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +# Dependency checker for rocm-examples Makefile build system +# +# Usage in example Makefiles: +# REQUIRED_DEPS := FFMPEG OPENCV +# include $(COMMON_INCLUDE_DIR)/require_deps.mk +# +# Before including, set COMMON_INCLUDE_DIR (already standard in all examples). +# +# This file works in two modes: +# 1. Fast path: includes config.mk (generated by configure.sh) from the repo root +# 2. Fallback: uses inline pkg-config checks for standalone builds +# +# After including, check SKIP_BUILD. This composes with filter_hip_architectures.mk +# which also sets SKIP_BUILD. +# +# Output variables: +# SKIP_BUILD - set to 1 if any required dependency is missing +# MISSING_DEPS - list of missing dependency names + +# Locate the repository root relative to COMMON_INCLUDE_DIR +_REPO_ROOT := $(dir $(COMMON_INCLUDE_DIR)) + +# Try to include the pre-generated config.mk (silent if absent) +-include $(_REPO_ROOT)/config.mk + +# If config.mk was not found, run inline fallback detection. +# We detect this by checking if HAVE_FFMPEG is defined (it's always written by configure.sh). +ifndef HAVE_FFMPEG + # Fallback: detect dependencies via pkg-config / file existence + + # FFmpeg + _FFMPEG_CHECK := $(shell pkg-config --exists libavcodec libavformat libavutil 2>/dev/null && echo 1 || echo 0) + ifeq ($(_FFMPEG_CHECK),0) + _FFMPEG_CHECK := $(if $(wildcard /usr/include/libavcodec/avcodec.h),1,0) + endif + HAVE_FFMPEG := $(_FFMPEG_CHECK) + ifeq ($(HAVE_FFMPEG),1) + FFMPEG_CFLAGS := $(shell pkg-config --cflags libavcodec libavformat libavutil 2>/dev/null) + FFMPEG_LIBS := $(shell pkg-config --libs libavcodec libavformat libavutil 2>/dev/null || echo "-lavcodec -lavformat -lavutil") + else + FFMPEG_CFLAGS := + FFMPEG_LIBS := + endif + + # OpenCV + _OPENCV_CHECK := $(shell pkg-config --exists opencv4 2>/dev/null && echo 1 || (pkg-config --exists opencv 2>/dev/null && echo 1 || echo 0)) + HAVE_OPENCV := $(_OPENCV_CHECK) + ifeq ($(HAVE_OPENCV),1) + OPENCV_CFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) + OPENCV_LIBS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) + else + OPENCV_CFLAGS := + OPENCV_LIBS := + endif + + # GLFW3 + _GLFW3_CHECK := $(shell pkg-config --exists glfw3 2>/dev/null && echo 1 || echo 0) + HAVE_GLFW3 := $(_GLFW3_CHECK) + ifeq ($(HAVE_GLFW3),1) + GLFW3_CFLAGS := $(shell pkg-config --cflags glfw3 2>/dev/null) + GLFW3_LIBS := $(shell pkg-config --libs glfw3 2>/dev/null) + else + GLFW3_CFLAGS := + GLFW3_LIBS := + endif + + # Vulkan + _VULKAN_CHECK := $(shell pkg-config --exists vulkan 2>/dev/null && echo 1 || echo 0) + ifeq ($(_VULKAN_CHECK),0) + _VULKAN_CHECK := $(if $(wildcard /usr/include/vulkan/vulkan.h),1,0) + endif + HAVE_VULKAN := $(_VULKAN_CHECK) + ifeq ($(HAVE_VULKAN),1) + VULKAN_CFLAGS := $(shell pkg-config --cflags vulkan 2>/dev/null) + VULKAN_LIBS := $(shell pkg-config --libs vulkan 2>/dev/null || echo "-lvulkan") + else + VULKAN_CFLAGS := + VULKAN_LIBS := + endif + + # glslangValidator + _GLSLANG_CHECK := $(shell command -v glslangValidator >/dev/null 2>&1 && echo 1 || echo 0) + HAVE_GLSLANG_VALIDATOR := $(_GLSLANG_CHECK) + +endif # ifndef HAVE_FFMPEG + +# Check REQUIRED_DEPS against HAVE_ flags +MISSING_DEPS := +$(foreach dep,$(REQUIRED_DEPS),\ + $(if $(filter 1,$(HAVE_$(dep))),,\ + $(eval MISSING_DEPS += $(dep)))) + +ifneq ($(MISSING_DEPS),) + SKIP_BUILD := 1 + $(info $(EXAMPLE): Skipping build — missing dependencies: $(MISSING_DEPS)) +endif diff --git a/HIP-Basic/opengl_interop/Makefile b/HIP-Basic/opengl_interop/Makefile index a8a76681c..3128fff4d 100644 --- a/HIP-Basic/opengl_interop/Makefile +++ b/HIP-Basic/opengl_interop/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../Common EXTERNAL_DIR := ../../External GPU_RUNTIME ?= HIP +# Dependency checking +REQUIRED_DEPS := GLFW3 +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include @@ -34,9 +40,9 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -ICPPFLAGS := -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) $(shell pkg-config --cflags glfw3) +ICPPFLAGS := -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) $(GLFW3_CFLAGS) ILDFLAGS := -ILDLIBS := $(shell pkg-config --libs glfw3) -ldl +ILDLIBS := $(GLFW3_LIBS) -ldl ifeq ($(GPU_RUNTIME), CUDA) ICXXFLAGS += -x cu @@ -65,3 +71,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/HIP-Basic/vulkan_interop/Makefile b/HIP-Basic/vulkan_interop/Makefile index e5b94a81e..53de4637d 100644 --- a/HIP-Basic/vulkan_interop/Makefile +++ b/HIP-Basic/vulkan_interop/Makefile @@ -24,6 +24,12 @@ EXAMPLE := hip_vulkan_interop COMMON_INCLUDE_DIR := ../../Common GPU_RUNTIME ?= HIP +# Dependency checking +REQUIRED_DEPS := GLFW3 VULKAN GLSLANG_VALIDATOR +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda @@ -36,9 +42,9 @@ CUDACXX ?= $(CUDA_INSTALL_DIR)/bin/nvcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -ICPPFLAGS := -I $(COMMON_INCLUDE_DIR) $(shell pkg-config --cflags glfw3 vulkan) +ICPPFLAGS := -I $(COMMON_INCLUDE_DIR) $(GLFW3_CFLAGS) $(VULKAN_CFLAGS) ILDFLAGS := -ILDLIBS := $(shell pkg-config --libs glfw3) +ILDLIBS := $(GLFW3_LIBS) IGLSLFLAGS := -V100 ifeq ($(GPU_RUNTIME), CUDA) @@ -72,3 +78,9 @@ clean: $(RM) $(EXAMPLE) sinewave.frag.spv.h sinewave.vert.spv.h .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/Makefile b/Libraries/Makefile index 4e9d9df70..8133663d4 100644 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -48,10 +48,8 @@ LIBRARIES += \ rocWMMA ifneq ($(wildcard $(INCLUDE_DIR)/rocdecode/rocdecode.h),) -ifneq ($(wildcard /usr/include/libavcodec/avcodec.h),) LIBRARIES += rocDecode endif -endif ifneq ($(wildcard $(INCLUDE_DIR)/rocjpeg/rocjpeg.h),) LIBRARIES += rocJPEG diff --git a/Libraries/RPP/box_filter/Makefile b/Libraries/RPP/box_filter/Makefile index a16745bc1..3f17c5ea9 100644 --- a/Libraries/RPP/box_filter/Makefile +++ b/Libraries/RPP/box_filter/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -36,7 +42,7 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -OPENCV_INCLUDE := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) +OPENCV_INCLUDE := $(OPENCV_CFLAGS) ICPPFLAGS := -isystem $(RPP_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) \ $(OPENCV_INCLUDE) -I $(ROCM_INSTALL_DIR)/include/rpp \ -DEXAMPLE_DATA_DIR=\"$(CURDIR)/../data/images\" @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/RPP/brightness/Makefile b/Libraries/RPP/brightness/Makefile index 90db33979..9d8026910 100644 --- a/Libraries/RPP/brightness/Makefile +++ b/Libraries/RPP/brightness/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -36,7 +42,7 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -OPENCV_INCLUDE := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) +OPENCV_INCLUDE := $(OPENCV_CFLAGS) ICPPFLAGS := -isystem $(RPP_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) \ $(OPENCV_INCLUDE) -I $(ROCM_INSTALL_DIR)/include/rpp \ -DEXAMPLE_DATA_DIR=\"$(CURDIR)/../data/images\" @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/RPP/contrast/Makefile b/Libraries/RPP/contrast/Makefile index 74e01b4d7..36c18a445 100644 --- a/Libraries/RPP/contrast/Makefile +++ b/Libraries/RPP/contrast/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -36,7 +42,7 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -OPENCV_INCLUDE := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) +OPENCV_INCLUDE := $(OPENCV_CFLAGS) ICPPFLAGS := -isystem $(RPP_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) \ $(OPENCV_INCLUDE) -I $(ROCM_INSTALL_DIR)/include/rpp \ -DEXAMPLE_DATA_DIR=\"$(CURDIR)/../data/images\" @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/RPP/flip/Makefile b/Libraries/RPP/flip/Makefile index a0481b4d6..4a07b3e5b 100644 --- a/Libraries/RPP/flip/Makefile +++ b/Libraries/RPP/flip/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -36,7 +42,7 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -OPENCV_INCLUDE := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) +OPENCV_INCLUDE := $(OPENCV_CFLAGS) ICPPFLAGS := -isystem $(RPP_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) \ $(OPENCV_INCLUDE) -I $(ROCM_INSTALL_DIR)/include/rpp \ -DEXAMPLE_DATA_DIR=\"$(CURDIR)/../data/images\" @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/RPP/gamma_correction/Makefile b/Libraries/RPP/gamma_correction/Makefile index 623d56d87..729b63392 100644 --- a/Libraries/RPP/gamma_correction/Makefile +++ b/Libraries/RPP/gamma_correction/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -36,7 +42,7 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -OPENCV_INCLUDE := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) +OPENCV_INCLUDE := $(OPENCV_CFLAGS) ICPPFLAGS := -isystem $(RPP_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) \ $(OPENCV_INCLUDE) -I $(ROCM_INSTALL_DIR)/include/rpp \ -DEXAMPLE_DATA_DIR=\"$(CURDIR)/../data/images\" @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/RPP/resize/Makefile b/Libraries/RPP/resize/Makefile index af0553553..5ea51b12f 100644 --- a/Libraries/RPP/resize/Makefile +++ b/Libraries/RPP/resize/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -36,7 +42,7 @@ HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # Common variables and flags CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) -OPENCV_INCLUDE := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) +OPENCV_INCLUDE := $(OPENCV_CFLAGS) ICPPFLAGS := -isystem $(RPP_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) \ $(OPENCV_INCLUDE) -I $(ROCM_INSTALL_DIR)/include/rpp \ -DEXAMPLE_DATA_DIR=\"$(CURDIR)/../data/images\" @@ -63,3 +69,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/bilateral_filter/Makefile b/Libraries/rocCV/bilateral_filter/Makefile index f49da5299..df01fa5ff 100644 --- a/Libraries/rocCV/bilateral_filter/Makefile +++ b/Libraries/rocCV/bilateral_filter/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/bnd_box/Makefile b/Libraries/rocCV/bnd_box/Makefile index 433ce01d9..59a1f77a4 100644 --- a/Libraries/rocCV/bnd_box/Makefile +++ b/Libraries/rocCV/bnd_box/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/center_crop/Makefile b/Libraries/rocCV/center_crop/Makefile index 003e9e61a..61c2fb771 100644 --- a/Libraries/rocCV/center_crop/Makefile +++ b/Libraries/rocCV/center_crop/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/composite/Makefile b/Libraries/rocCV/composite/Makefile index 402399f12..fb3efc01c 100644 --- a/Libraries/rocCV/composite/Makefile +++ b/Libraries/rocCV/composite/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/copy_make_border/Makefile b/Libraries/rocCV/copy_make_border/Makefile index c7eeefe92..118d5a66b 100644 --- a/Libraries/rocCV/copy_make_border/Makefile +++ b/Libraries/rocCV/copy_make_border/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/cropandresize/Makefile b/Libraries/rocCV/cropandresize/Makefile index 8276d8000..09eada2a1 100644 --- a/Libraries/rocCV/cropandresize/Makefile +++ b/Libraries/rocCV/cropandresize/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/custom_crop/Makefile b/Libraries/rocCV/custom_crop/Makefile index 94a2dd912..003bf5e63 100644 --- a/Libraries/rocCV/custom_crop/Makefile +++ b/Libraries/rocCV/custom_crop/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/gamma_contrast/Makefile b/Libraries/rocCV/gamma_contrast/Makefile index 34d5b22c2..e8c05d4c5 100644 --- a/Libraries/rocCV/gamma_contrast/Makefile +++ b/Libraries/rocCV/gamma_contrast/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/normalize/Makefile b/Libraries/rocCV/normalize/Makefile index a938a430b..7e44b663c 100644 --- a/Libraries/rocCV/normalize/Makefile +++ b/Libraries/rocCV/normalize/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocCV/warp_perspective/Makefile b/Libraries/rocCV/warp_perspective/Makefile index 1f11145f7..f14face83 100644 --- a/Libraries/rocCV/warp_perspective/Makefile +++ b/Libraries/rocCV/warp_perspective/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := OPENCV +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -34,8 +40,8 @@ ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc # OpenCV variables -OPENCV_CXXFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) -OPENCV_LDFLAGS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) +OPENCV_CXXFLAGS := $(OPENCV_CFLAGS) +OPENCV_LDFLAGS := $(OPENCV_LIBS) # Common variables and flags CXX_STD := c++20 @@ -64,3 +70,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode/Makefile b/Libraries/rocDecode/video_decode/Makefile index 99da825cc..842989cfb 100644 --- a/Libraries/rocDecode/video_decode/Makefile +++ b/Libraries/rocDecode/video_decode/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -99,3 +105,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode_batch/Makefile b/Libraries/rocDecode/video_decode_batch/Makefile index 3e3ba9097..de45fcca9 100644 --- a/Libraries/rocDecode/video_decode_batch/Makefile +++ b/Libraries/rocDecode/video_decode_batch/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -79,3 +85,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode_mem/Makefile b/Libraries/rocDecode/video_decode_mem/Makefile index 728aefb9f..d7024829f 100644 --- a/Libraries/rocDecode/video_decode_mem/Makefile +++ b/Libraries/rocDecode/video_decode_mem/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -79,3 +85,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode_multi_files/Makefile b/Libraries/rocDecode/video_decode_multi_files/Makefile index a983efea7..63bd0574d 100644 --- a/Libraries/rocDecode/video_decode_multi_files/Makefile +++ b/Libraries/rocDecode/video_decode_multi_files/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -79,3 +85,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode_perf/Makefile b/Libraries/rocDecode/video_decode_perf/Makefile index 67d891f1b..a918be6cd 100644 --- a/Libraries/rocDecode/video_decode_perf/Makefile +++ b/Libraries/rocDecode/video_decode_perf/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -99,3 +105,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode_pic_files/Makefile b/Libraries/rocDecode/video_decode_pic_files/Makefile index 31ca81af5..aeff2f08e 100644 --- a/Libraries/rocDecode/video_decode_pic_files/Makefile +++ b/Libraries/rocDecode/video_decode_pic_files/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -99,3 +105,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_decode_rgb/Makefile b/Libraries/rocDecode/video_decode_rgb/Makefile index 648078329..85903fbdf 100644 --- a/Libraries/rocDecode/video_decode_rgb/Makefile +++ b/Libraries/rocDecode/video_decode_rgb/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -79,3 +85,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocDecode/video_to_sequence/Makefile b/Libraries/rocDecode/video_to_sequence/Makefile index ecbef6233..c77978c5f 100644 --- a/Libraries/rocDecode/video_to_sequence/Makefile +++ b/Libraries/rocDecode/video_to_sequence/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Dependency checking +REQUIRED_DEPS := FFMPEG +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) UTILS_DIR := ${ROCM_INSTALL_DIR}/share/rocdecode/utils @@ -79,3 +85,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/Libraries/rocProfiler-SDK/code_object_tracing/Makefile b/Libraries/rocProfiler-SDK/code_object_tracing/Makefile index dca9c5789..6c1a7ca7e 100644 --- a/Libraries/rocProfiler-SDK/code_object_tracing/Makefile +++ b/Libraries/rocProfiler-SDK/code_object_tracing/Makefile @@ -39,7 +39,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCPROFILER_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocprofiler-sdk -lstdc++fs +ILDLIBS := -lrocprofiler-sdk -lstdc++fs -lpthread ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Makefile b/Makefile index 353de1203..01c1cce3b 100644 --- a/Makefile +++ b/Makefile @@ -30,10 +30,13 @@ SUB_PROJECTS := \ all: $(SUB_PROJECTS) +configure: + ./configure.sh --rocm-path="$(or $(ROCM_PATH),/opt/rocm)" + clean: TARGET=clean clean: all $(SUB_PROJECTS): $(MAKE) -C $@ $(TARGET) -.PHONY: all clean $(SUB_PROJECTS) +.PHONY: all configure clean $(SUB_PROJECTS) diff --git a/configure.sh b/configure.sh new file mode 100755 index 000000000..4d9ad9a94 --- /dev/null +++ b/configure.sh @@ -0,0 +1,169 @@ +#!/bin/sh +# MIT License +# +# Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +# configure.sh - Dependency detection for rocm-examples Makefile build system +# +# Probes for external dependencies and writes a config.mk file that individual +# example Makefiles include to decide whether to build or skip. +# +# Usage: +# ./configure.sh [--rocm-path=DIR] +# +# Output: +# config.mk in the repository root + +set -e + +ROCM_PATH="/opt/rocm" + +for arg in "$@"; do + case "$arg" in + --rocm-path=*) + ROCM_PATH="${arg#--rocm-path=}" + ;; + --help|-h) + echo "Usage: $0 [--rocm-path=DIR]" + echo " --rocm-path=DIR Path to ROCm installation (default: /opt/rocm)" + exit 0 + ;; + *) + echo "Unknown option: $arg" >&2 + exit 1 + ;; + esac +done + +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +CONFIG_MK="${SCRIPT_DIR}/config.mk" + +echo "configure: detecting dependencies (ROCm path: ${ROCM_PATH})" + +# Helper: check via pkg-config +pkg_check() { + pkg-config --exists "$@" 2>/dev/null +} + +# Helper: get pkg-config cflags +pkg_cflags() { + pkg-config --cflags "$@" 2>/dev/null || true +} + +# Helper: get pkg-config libs +pkg_libs() { + pkg-config --libs "$@" 2>/dev/null || true +} + +# Start writing config.mk +cat > "${CONFIG_MK}" << 'HEADER' +# Auto-generated by configure.sh - do not edit +# Re-run ./configure.sh to regenerate +HEADER + +echo "" >> "${CONFIG_MK}" + +# --- FFmpeg (libavcodec, libavformat, libavutil) --- +HAVE_FFMPEG=0 +FFMPEG_CFLAGS="" +FFMPEG_LIBS="" +if pkg_check libavcodec libavformat libavutil; then + HAVE_FFMPEG=1 + FFMPEG_CFLAGS="$(pkg_cflags libavcodec libavformat libavutil)" + FFMPEG_LIBS="$(pkg_libs libavcodec libavformat libavutil)" +elif [ -f /usr/include/libavcodec/avcodec.h ]; then + HAVE_FFMPEG=1 + FFMPEG_LIBS="-lavcodec -lavformat -lavutil" +fi +echo " FFmpeg: $([ ${HAVE_FFMPEG} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_FFMPEG := ${HAVE_FFMPEG} +FFMPEG_CFLAGS := ${FFMPEG_CFLAGS} +FFMPEG_LIBS := ${FFMPEG_LIBS} +EOF + +# --- OpenCV --- +HAVE_OPENCV=0 +OPENCV_CFLAGS="" +OPENCV_LIBS="" +if pkg_check opencv4; then + HAVE_OPENCV=1 + OPENCV_CFLAGS="$(pkg_cflags opencv4)" + OPENCV_LIBS="$(pkg_libs opencv4)" +elif pkg_check opencv; then + HAVE_OPENCV=1 + OPENCV_CFLAGS="$(pkg_cflags opencv)" + OPENCV_LIBS="$(pkg_libs opencv)" +fi +echo " OpenCV: $([ ${HAVE_OPENCV} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_OPENCV := ${HAVE_OPENCV} +OPENCV_CFLAGS := ${OPENCV_CFLAGS} +OPENCV_LIBS := ${OPENCV_LIBS} +EOF + +# --- GLFW3 --- +HAVE_GLFW3=0 +GLFW3_CFLAGS="" +GLFW3_LIBS="" +if pkg_check glfw3; then + HAVE_GLFW3=1 + GLFW3_CFLAGS="$(pkg_cflags glfw3)" + GLFW3_LIBS="$(pkg_libs glfw3)" +fi +echo " GLFW3: $([ ${HAVE_GLFW3} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_GLFW3 := ${HAVE_GLFW3} +GLFW3_CFLAGS := ${GLFW3_CFLAGS} +GLFW3_LIBS := ${GLFW3_LIBS} +EOF + +# --- Vulkan --- +HAVE_VULKAN=0 +VULKAN_CFLAGS="" +VULKAN_LIBS="" +if pkg_check vulkan; then + HAVE_VULKAN=1 + VULKAN_CFLAGS="$(pkg_cflags vulkan)" + VULKAN_LIBS="$(pkg_libs vulkan)" +elif [ -f /usr/include/vulkan/vulkan.h ]; then + HAVE_VULKAN=1 + VULKAN_LIBS="-lvulkan" +fi +echo " Vulkan: $([ ${HAVE_VULKAN} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_VULKAN := ${HAVE_VULKAN} +VULKAN_CFLAGS := ${VULKAN_CFLAGS} +VULKAN_LIBS := ${VULKAN_LIBS} +EOF + +# --- glslangValidator --- +HAVE_GLSLANG_VALIDATOR=0 +if command -v glslangValidator >/dev/null 2>&1; then + HAVE_GLSLANG_VALIDATOR=1 +fi +echo " glslangValidator: $([ ${HAVE_GLSLANG_VALIDATOR} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_GLSLANG_VALIDATOR := ${HAVE_GLSLANG_VALIDATOR} +EOF + +echo "" +echo "configure: wrote ${CONFIG_MK}" diff --git a/run_makefile_tests.sh b/run_makefile_tests.sh new file mode 100755 index 000000000..442810a64 --- /dev/null +++ b/run_makefile_tests.sh @@ -0,0 +1,132 @@ +#!/bin/sh +# MIT License +# +# Copyright (c) 2025 Advanced Micro Devices, Inc. All rights reserved. +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. + +# run_makefile_tests.sh - Run tests for Makefile-built examples +# +# Finds all executables built by the Makefile build system, runs each one +# with a timeout, and reports pass/fail results. +# +# Usage: +# ./run_makefile_tests.sh [--skip-file FILE] [--timeout SECONDS] +# +# The skip file should contain one test name per line (the EXAMPLE name). + +set -u + +SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +SKIP_FILE="" +TIMEOUT=120 + +for arg in "$@"; do + case "$arg" in + --skip-file=*) + SKIP_FILE="${arg#--skip-file=}" + ;; + --timeout=*) + TIMEOUT="${arg#--timeout=}" + ;; + --help|-h) + echo "Usage: $0 [--skip-file=FILE] [--timeout=SECONDS]" + exit 0 + ;; + esac +done + +# Load skip list into a string for matching +SKIP_LIST="" +if [ -n "${SKIP_FILE}" ] && [ -f "${SKIP_FILE}" ]; then + SKIP_LIST=$(cat "${SKIP_FILE}") +fi + +is_skipped() { + test_name="$1" + echo "${SKIP_LIST}" | grep -qx "${test_name}" 2>/dev/null +} + +PASSED=0 +FAILED=0 +SKIPPED=0 +TOTAL=0 +FAILED_TESTS="" + +# Find all Makefiles with EXAMPLE definitions, extract name and directory +find "${SCRIPT_DIR}" -name Makefile -path '*/Makefile' | sort | while IFS= read -r makefile; do + dir=$(dirname "$makefile") + example_name=$(grep '^EXAMPLE := ' "$makefile" 2>/dev/null | head -1 | sed 's/^EXAMPLE := //') + + # Skip Makefiles without EXAMPLE (parent Makefiles) + [ -z "${example_name}" ] && continue + + # Skip if executable wasn't built + [ ! -x "${dir}/${example_name}" ] && continue + + echo "${dir}|${example_name}" +done > /tmp/makefile_tests_list.txt + +# Count and run +while IFS='|' read -r dir example_name; do + TOTAL=$((TOTAL + 1)) + + if is_skipped "${example_name}"; then + SKIPPED=$((SKIPPED + 1)) + printf " SKIP %s\n" "${example_name}" + continue + fi + + # Run the test with timeout + printf " RUN %s\n" "${example_name}" + if timeout "${TIMEOUT}" "${dir}/${example_name}" > "/tmp/test_${example_name}.log" 2>&1; then + PASSED=$((PASSED + 1)) + printf " PASS %s\n" "${example_name}" + else + exit_code=$? + FAILED=$((FAILED + 1)) + FAILED_TESTS="${FAILED_TESTS} ${example_name}" + if [ "${exit_code}" -eq 124 ]; then + printf " TIMEOUT %s (after %ss)\n" "${example_name}" "${TIMEOUT}" + else + printf " FAIL %s (exit code %d)\n" "${example_name}" "${exit_code}" + fi + # Print last 20 lines of output for failed tests + echo "--- output (last 20 lines) ---" + tail -20 "/tmp/test_${example_name}.log" + echo "--- end output ---" + fi +done < /tmp/makefile_tests_list.txt + +rm -f /tmp/makefile_tests_list.txt + +echo "" +echo "==========================================" +echo "Makefile test results:" +echo " Total: ${TOTAL}" +echo " Passed: ${PASSED}" +echo " Failed: ${FAILED}" +echo " Skipped: ${SKIPPED}" +echo "==========================================" + +if [ -n "${FAILED_TESTS}" ]; then + echo "" + echo "Failed tests:${FAILED_TESTS}" + exit 1 +fi From b8f2454493dccecb66f5268962cedff1dabb2144 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Thu, 19 Mar 2026 22:30:14 +0000 Subject: [PATCH 14/36] Gate code_object_isa_decode behind libdw and amd_comgr checks The code_object_isa_decode example links -ldw and -lamd_comgr which are not available in all CI containers (e.g. AlmaLinux). Add LIBDW and AMD_COMGR to the configure detection system and skip the example when either is missing. Co-Authored-By: Claude Opus 4.6 --- Common/require_deps.mk | 15 ++++++++++++ .../code_object_isa_decode/Makefile | 12 ++++++++++ configure.sh | 24 +++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/Common/require_deps.mk b/Common/require_deps.mk index 11674b37d..f2010c4d7 100644 --- a/Common/require_deps.mk +++ b/Common/require_deps.mk @@ -100,6 +100,21 @@ ifndef HAVE_FFMPEG VULKAN_LIBS := endif + # libdw (elfutils) + _LIBDW_CHECK := $(shell pkg-config --exists libdw 2>/dev/null && echo 1 || echo 0) + ifeq ($(_LIBDW_CHECK),0) + _LIBDW_CHECK := $(if $(or $(wildcard /usr/include/elfutils/libdw.h),$(wildcard /usr/include/dwarf.h)),1,0) + endif + HAVE_LIBDW := $(_LIBDW_CHECK) + + # amd_comgr + ROCM_INSTALL_DIR ?= $(or $(ROCM_PATH),/opt/rocm) + _AMD_COMGR_CHECK := $(if $(or $(wildcard $(ROCM_INSTALL_DIR)/include/amd_comgr/amd_comgr.h),$(wildcard $(ROCM_INSTALL_DIR)/lib/libamd_comgr.so)),1,0) + ifeq ($(_AMD_COMGR_CHECK),0) + _AMD_COMGR_CHECK := $(shell pkg-config --exists amd_comgr 2>/dev/null && echo 1 || echo 0) + endif + HAVE_AMD_COMGR := $(_AMD_COMGR_CHECK) + # glslangValidator _GLSLANG_CHECK := $(shell command -v glslangValidator >/dev/null 2>&1 && echo 1 || echo 0) HAVE_GLSLANG_VALIDATOR := $(_GLSLANG_CHECK) diff --git a/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile b/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile index 408005e72..fb8cae6a2 100644 --- a/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile +++ b/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile @@ -25,6 +25,12 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME ?= HIP +# Dependency checking +REQUIRED_DEPS := LIBDW AMD_COMGR +include $(COMMON_INCLUDE_DIR)/require_deps.mk + +ifneq ($(SKIP_BUILD),1) + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -60,3 +66,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif diff --git a/configure.sh b/configure.sh index 4d9ad9a94..f18f13bf6 100755 --- a/configure.sh +++ b/configure.sh @@ -155,6 +155,30 @@ VULKAN_CFLAGS := ${VULKAN_CFLAGS} VULKAN_LIBS := ${VULKAN_LIBS} EOF +# --- libdw (elfutils) --- +HAVE_LIBDW=0 +if pkg_check libdw; then + HAVE_LIBDW=1 +elif [ -f /usr/include/elfutils/libdw.h ] || [ -f /usr/include/dwarf.h ]; then + HAVE_LIBDW=1 +fi +echo " libdw: $([ ${HAVE_LIBDW} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_LIBDW := ${HAVE_LIBDW} +EOF + +# --- amd_comgr --- +HAVE_AMD_COMGR=0 +if [ -f "${ROCM_PATH}/include/amd_comgr/amd_comgr.h" ] || [ -f "${ROCM_PATH}/lib/libamd_comgr.so" ]; then + HAVE_AMD_COMGR=1 +elif pkg_check amd_comgr; then + HAVE_AMD_COMGR=1 +fi +echo " amd_comgr: $([ ${HAVE_AMD_COMGR} -eq 1 ] && echo yes || echo no)" +cat >> "${CONFIG_MK}" << EOF +HAVE_AMD_COMGR := ${HAVE_AMD_COMGR} +EOF + # --- glslangValidator --- HAVE_GLSLANG_VALIDATOR=0 if command -v glslangValidator >/dev/null 2>&1; then From 26d6e6dcf1e638facb41d13152f60a7a2f7f08c3 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 14:40:03 +0000 Subject: [PATCH 15/36] Improve Makefile test runner output with progress counter Show (N/total) counter for each test like ctest does, e.g.: (1/42) RUN hip_device_query (1/42) PASS hip_device_query (2/42) SKIP rccl_allgather Also print total test count and skip file info upfront, and show a single summary line at the end. Co-Authored-By: Claude Opus 4.6 --- run_makefile_tests.sh | 56 +++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/run_makefile_tests.sh b/run_makefile_tests.sh index 442810a64..1b207ab77 100755 --- a/run_makefile_tests.sh +++ b/run_makefile_tests.sh @@ -27,9 +27,10 @@ # with a timeout, and reports pass/fail results. # # Usage: -# ./run_makefile_tests.sh [--skip-file FILE] [--timeout SECONDS] +# ./run_makefile_tests.sh [--skip-file=FILE] [--timeout=SECONDS] # # The skip file should contain one test name per line (the EXAMPLE name). +# This is the same format produced by generate_skip_tests.py. set -u @@ -47,6 +48,10 @@ for arg in "$@"; do ;; --help|-h) echo "Usage: $0 [--skip-file=FILE] [--timeout=SECONDS]" + echo "" + echo " --skip-file=FILE File with test names to skip (one per line)." + echo " Same format as generate_skip_tests.py output." + echo " --timeout=SECONDS Per-test timeout (default: 120)" exit 0 ;; esac @@ -63,11 +68,7 @@ is_skipped() { echo "${SKIP_LIST}" | grep -qx "${test_name}" 2>/dev/null } -PASSED=0 -FAILED=0 -SKIPPED=0 -TOTAL=0 -FAILED_TESTS="" +TESTS_LIST="/tmp/makefile_tests_list_$$.txt" # Find all Makefiles with EXAMPLE definitions, extract name and directory find "${SCRIPT_DIR}" -name Makefile -path '*/Makefile' | sort | while IFS= read -r makefile; do @@ -81,48 +82,61 @@ find "${SCRIPT_DIR}" -name Makefile -path '*/Makefile' | sort | while IFS= read [ ! -x "${dir}/${example_name}" ] && continue echo "${dir}|${example_name}" -done > /tmp/makefile_tests_list.txt +done > "${TESTS_LIST}" + +# Count total tests upfront +NUM_TESTS=$(wc -l < "${TESTS_LIST}") + +echo "" +echo "Found ${NUM_TESTS} Makefile-built test(s)" +if [ -n "${SKIP_FILE}" ] && [ -f "${SKIP_FILE}" ] && [ -s "${SKIP_FILE}" ]; then + echo "Skip file: ${SKIP_FILE} ($(wc -l < "${SKIP_FILE}") entries)" +fi +echo "" + +PASSED=0 +FAILED=0 +SKIPPED=0 +CURRENT=0 +FAILED_TESTS="" -# Count and run +# Run tests while IFS='|' read -r dir example_name; do - TOTAL=$((TOTAL + 1)) + CURRENT=$((CURRENT + 1)) if is_skipped "${example_name}"; then SKIPPED=$((SKIPPED + 1)) - printf " SKIP %s\n" "${example_name}" + printf "(%d/%d) SKIP %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" continue fi # Run the test with timeout - printf " RUN %s\n" "${example_name}" + printf "(%d/%d) RUN %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" if timeout "${TIMEOUT}" "${dir}/${example_name}" > "/tmp/test_${example_name}.log" 2>&1; then PASSED=$((PASSED + 1)) - printf " PASS %s\n" "${example_name}" + printf "(%d/%d) PASS %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" else exit_code=$? FAILED=$((FAILED + 1)) FAILED_TESTS="${FAILED_TESTS} ${example_name}" if [ "${exit_code}" -eq 124 ]; then - printf " TIMEOUT %s (after %ss)\n" "${example_name}" "${TIMEOUT}" + printf "(%d/%d) TIMEOUT %s (after %ss)\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" "${TIMEOUT}" else - printf " FAIL %s (exit code %d)\n" "${example_name}" "${exit_code}" + printf "(%d/%d) FAIL %s (exit code %d)\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" "${exit_code}" fi # Print last 20 lines of output for failed tests echo "--- output (last 20 lines) ---" tail -20 "/tmp/test_${example_name}.log" echo "--- end output ---" fi -done < /tmp/makefile_tests_list.txt +done < "${TESTS_LIST}" -rm -f /tmp/makefile_tests_list.txt +rm -f "${TESTS_LIST}" echo "" echo "==========================================" -echo "Makefile test results:" -echo " Total: ${TOTAL}" -echo " Passed: ${PASSED}" -echo " Failed: ${FAILED}" -echo " Skipped: ${SKIPPED}" +RAN=$((PASSED + FAILED)) +echo "Makefile test results: ${RAN} tests ran, ${PASSED} passed, ${FAILED} failed, ${SKIPPED} skipped (${NUM_TESTS} total)" echo "==========================================" if [ -n "${FAILED_TESTS}" ]; then From 6c03dc75677b1302c12efb16b03f34c4200e09ca Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 14:48:05 +0000 Subject: [PATCH 16/36] Fix Makefile test runner: cd into example dir, add test args support - Run each test from its own directory so data files (test.jpg, graph4096.txt, etc.) are found via relative paths - Support TEST_ARGS variable in Makefiles for tests needing arguments (e.g. hip_bfs requires graph4096.txt as input) - Add AlmaLinux 8 skip entries for GLIBC_2.34 incompatible binaries (warp_size_reduction) and missing hipSPARSELt Tensile libraries Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/generate_skip_tests.py | 10 ++++++++-- HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile | 1 + run_makefile_tests.sh | 13 ++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.github/build_tools/generate_skip_tests.py b/.github/build_tools/generate_skip_tests.py index 3aefee99d..ae8e2b3ef 100644 --- a/.github/build_tools/generate_skip_tests.py +++ b/.github/build_tools/generate_skip_tests.py @@ -29,8 +29,14 @@ # Tests to skip for a specific GPU target + distro combination. # Keys are ":", e.g. "gfx1151:sles-15.7". DISTRO_SKIP_TESTS = { - # Example: - # "gfx1151:sles-15.7": ["some_test"], + # AlmaLinux 8 has glibc 2.28; binaries compiled against 2.34+ fail at runtime + "gfx1100:almalinux-8": [ + "hip_template_warp_size_reduction", + "hip_warp_size_reduction", + # hipSPARSELt Tensile library files not packaged for this target + "hipsparselt_spmm", + "hipsparselt_spmm_advanced", + ], } diff --git a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile index 9f16b7e81..e271571d3 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile @@ -21,6 +21,7 @@ # SOFTWARE. EXAMPLE := hip_bfs +TEST_ARGS := graph4096.txt GRAPHGEN := graphgen GPU_RUNTIME := HIP diff --git a/run_makefile_tests.sh b/run_makefile_tests.sh index 1b207ab77..ccc616ad0 100755 --- a/run_makefile_tests.sh +++ b/run_makefile_tests.sh @@ -70,7 +70,7 @@ is_skipped() { TESTS_LIST="/tmp/makefile_tests_list_$$.txt" -# Find all Makefiles with EXAMPLE definitions, extract name and directory +# Find all Makefiles with EXAMPLE definitions, extract name, directory, and test args find "${SCRIPT_DIR}" -name Makefile -path '*/Makefile' | sort | while IFS= read -r makefile; do dir=$(dirname "$makefile") example_name=$(grep '^EXAMPLE := ' "$makefile" 2>/dev/null | head -1 | sed 's/^EXAMPLE := //') @@ -81,7 +81,10 @@ find "${SCRIPT_DIR}" -name Makefile -path '*/Makefile' | sort | while IFS= read # Skip if executable wasn't built [ ! -x "${dir}/${example_name}" ] && continue - echo "${dir}|${example_name}" + # Extract TEST_ARGS if defined (e.g. TEST_ARGS := graph4096.txt) + test_args=$(grep '^TEST_ARGS := ' "$makefile" 2>/dev/null | head -1 | sed 's/^TEST_ARGS := //') + + echo "${dir}|${example_name}|${test_args}" done > "${TESTS_LIST}" # Count total tests upfront @@ -101,7 +104,7 @@ CURRENT=0 FAILED_TESTS="" # Run tests -while IFS='|' read -r dir example_name; do +while IFS='|' read -r dir example_name test_args; do CURRENT=$((CURRENT + 1)) if is_skipped "${example_name}"; then @@ -110,9 +113,9 @@ while IFS='|' read -r dir example_name; do continue fi - # Run the test with timeout + # Run the test from its own directory (so data files are found) printf "(%d/%d) RUN %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" - if timeout "${TIMEOUT}" "${dir}/${example_name}" > "/tmp/test_${example_name}.log" 2>&1; then + if (cd "${dir}" && timeout "${TIMEOUT}" "./${example_name}" ${test_args}) > "/tmp/test_${example_name}.log" 2>&1; then PASSED=$((PASSED + 1)) printf "(%d/%d) PASS %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" else From 94ade5e8705d73c31e72d9ce5da2b43fec21560e Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 15:28:07 +0000 Subject: [PATCH 17/36] Run Makefile tests after ctest, using ctest test list as allow filter Only run Makefile-built tests that are also registered as ctest tests. This ensures the Makefile test runner exercises exactly the same set of examples that CMake validates, avoiding failures from examples that need special arguments, scripts, or aren't meant to run standalone. - Add --allow-file option to run_makefile_tests.sh: filters Makefile executables to only those present in the allow list - Move Makefile tests step after ctest in CI workflow - Extract ctest test names via `ctest -N` and pass as the allow file Co-Authored-By: Claude Opus 4.6 --- .../build-rocm-examples-reusable.yml | 20 ++++--- run_makefile_tests.sh | 58 +++++++++++++++---- 2 files changed, 60 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 3a8116f4e..739e327f0 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -114,13 +114,6 @@ jobs: ./configure.sh --rocm-path="${ROCM_PATH}" make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" - - name: Makefile tests - if: ${{ !cancelled() }} - run: | - python3 .github/build_tools/generate_skip_tests.py --target ${{ matrix.gpu_config.gpu_target }} --distro ${{ inputs.distro }} - SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" - ./run_makefile_tests.sh --skip-file="${SKIP_FILE}" --timeout=120 - - name: CMake configure if: ${{ !cancelled() }} run: | @@ -229,6 +222,19 @@ jobs: echo "" >> $GITHUB_STEP_SUMMARY fi + - name: Makefile tests + if: ${{ !cancelled() }} + run: | + # Extract the list of registered ctest test names + ctest --test-dir build -N | grep ' Test #' | sed 's/.*: //' > /tmp/ctest_test_names.txt + echo "ctest registered $(wc -l < /tmp/ctest_test_names.txt) tests" + + SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" + ./run_makefile_tests.sh \ + --allow-file=/tmp/ctest_test_names.txt \ + --skip-file="${SKIP_FILE}" \ + --timeout=120 + - name: Upload test logs if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 diff --git a/run_makefile_tests.sh b/run_makefile_tests.sh index ccc616ad0..cf3abe892 100755 --- a/run_makefile_tests.sh +++ b/run_makefile_tests.sh @@ -27,19 +27,30 @@ # with a timeout, and reports pass/fail results. # # Usage: -# ./run_makefile_tests.sh [--skip-file=FILE] [--timeout=SECONDS] +# ./run_makefile_tests.sh [--allow-file=FILE] [--skip-file=FILE] [--timeout=SECONDS] # -# The skip file should contain one test name per line (the EXAMPLE name). -# This is the same format produced by generate_skip_tests.py. +# Options: +# --allow-file=FILE Only run tests listed in this file (one name per line). +# Use to mirror the ctest test list so Makefile tests run +# exactly the same set as CMake. Tests not in the allow +# list are silently skipped. +# --skip-file=FILE Skip tests listed in this file (one name per line). +# Same format as generate_skip_tests.py output. +# Applied after allow-file filtering. +# --timeout=SECONDS Per-test timeout (default: 120). set -u SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" +ALLOW_FILE="" SKIP_FILE="" TIMEOUT=120 for arg in "$@"; do case "$arg" in + --allow-file=*) + ALLOW_FILE="${arg#--allow-file=}" + ;; --skip-file=*) SKIP_FILE="${arg#--skip-file=}" ;; @@ -47,22 +58,32 @@ for arg in "$@"; do TIMEOUT="${arg#--timeout=}" ;; --help|-h) - echo "Usage: $0 [--skip-file=FILE] [--timeout=SECONDS]" - echo "" - echo " --skip-file=FILE File with test names to skip (one per line)." - echo " Same format as generate_skip_tests.py output." - echo " --timeout=SECONDS Per-test timeout (default: 120)" + echo "Usage: $0 [--allow-file=FILE] [--skip-file=FILE] [--timeout=SECONDS]" exit 0 ;; esac done -# Load skip list into a string for matching +# Load allow list (if provided, only tests in this list will run) +ALLOW_LIST="" +USE_ALLOW_LIST=0 +if [ -n "${ALLOW_FILE}" ] && [ -f "${ALLOW_FILE}" ]; then + ALLOW_LIST=$(cat "${ALLOW_FILE}") + USE_ALLOW_LIST=1 +fi + +# Load skip list SKIP_LIST="" if [ -n "${SKIP_FILE}" ] && [ -f "${SKIP_FILE}" ]; then SKIP_LIST=$(cat "${SKIP_FILE}") fi +is_allowed() { + test_name="$1" + [ "${USE_ALLOW_LIST}" -eq 0 ] && return 0 + echo "${ALLOW_LIST}" | grep -qx "${test_name}" 2>/dev/null +} + is_skipped() { test_name="$1" echo "${SKIP_LIST}" | grep -qx "${test_name}" 2>/dev/null @@ -87,11 +108,26 @@ find "${SCRIPT_DIR}" -name Makefile -path '*/Makefile' | sort | while IFS= read echo "${dir}|${example_name}|${test_args}" done > "${TESTS_LIST}" -# Count total tests upfront +NUM_BUILT=$(wc -l < "${TESTS_LIST}") + +# Filter to only allowed tests (if allow list provided) +if [ "${USE_ALLOW_LIST}" -eq 1 ]; then + FILTERED_LIST="/tmp/makefile_tests_filtered_$$.txt" + while IFS='|' read -r dir example_name test_args; do + if is_allowed "${example_name}"; then + echo "${dir}|${example_name}|${test_args}" + fi + done < "${TESTS_LIST}" > "${FILTERED_LIST}" + mv "${FILTERED_LIST}" "${TESTS_LIST}" +fi + NUM_TESTS=$(wc -l < "${TESTS_LIST}") echo "" -echo "Found ${NUM_TESTS} Makefile-built test(s)" +echo "Found ${NUM_BUILT} Makefile-built executable(s)" +if [ "${USE_ALLOW_LIST}" -eq 1 ]; then + echo "Allow file: ${ALLOW_FILE} ($(wc -l < "${ALLOW_FILE}") ctest entries, ${NUM_TESTS} matched)" +fi if [ -n "${SKIP_FILE}" ] && [ -f "${SKIP_FILE}" ] && [ -s "${SKIP_FILE}" ]; then echo "Skip file: ${SKIP_FILE} ($(wc -l < "${SKIP_FILE}") entries)" fi From 88c30be11b6d9edd0dc3abdcb079af457c5f0aed Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 15:52:01 +0000 Subject: [PATCH 18/36] Skip rocdec_decode in Makefile tests (needs CMake test data) rocdecode_rocdec_decode requires -i which is only available via ROCDECODE_TEST_FRAMES_DIR set during CMake configure. Add a MAKEFILE_SKIP_TESTS list to generate_skip_tests.py and a --makefile flag to include these skips. The CI Makefile tests step now regenerates the skip list with --makefile before running. Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/generate_skip_tests.py | 17 +++++++++++++++++ .../workflows/build-rocm-examples-reusable.yml | 6 ++++++ 2 files changed, 23 insertions(+) diff --git a/.github/build_tools/generate_skip_tests.py b/.github/build_tools/generate_skip_tests.py index ae8e2b3ef..406d3fe97 100644 --- a/.github/build_tools/generate_skip_tests.py +++ b/.github/build_tools/generate_skip_tests.py @@ -8,6 +8,13 @@ import argparse import os +# Tests to always skip in Makefile runs. These require test data or arguments +# that are only set up by the CMake build system (e.g. ROCDECODE_TEST_FRAMES_DIR). +# ctest handles them via add_test() COMMAND args; the Makefile runner cannot. +MAKEFILE_SKIP_TESTS = [ + "rocdecode_rocdec_decode", +] + # Tests to skip per GPU target (one list per target that has skips) SKIP_TESTS = { "gfx1151": [ @@ -59,10 +66,20 @@ def main(): default="", help="Distro key for distro-specific skips (e.g. sles-15.7)", ) + parser.add_argument( + "--makefile", + action="store_true", + help="Include Makefile-only skips (tests needing CMake test data)", + ) args = parser.parse_args() lines = list(SKIP_TESTS.get(args.target, [])) + if args.makefile: + for test in MAKEFILE_SKIP_TESTS: + if test not in lines: + lines.append(test) + if args.distro: combo_key = f"{args.target}:{args.distro}" distro_lines = DISTRO_SKIP_TESTS.get(combo_key, []) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 739e327f0..13971e364 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -229,7 +229,13 @@ jobs: ctest --test-dir build -N | grep ' Test #' | sed 's/.*: //' > /tmp/ctest_test_names.txt echo "ctest registered $(wc -l < /tmp/ctest_test_names.txt) tests" + # Generate skip list with --makefile to include tests that need CMake test data + python3 .github/build_tools/generate_skip_tests.py \ + --target ${{ matrix.gpu_config.gpu_target }} \ + --distro ${{ inputs.distro }} \ + --makefile SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" + ./run_makefile_tests.sh \ --allow-file=/tmp/ctest_test_names.txt \ --skip-file="${SKIP_FILE}" \ From df9d410bad1e33f46fc33ca76e3aed96f965f775 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 16:31:20 +0000 Subject: [PATCH 19/36] Fix FFmpeg/Vulkan detection: check libraries exist, not just headers On SLES 15.7 the FFmpeg development headers exist at /usr/include/libavcodec/avcodec.h but the shared libraries are not installed, causing link failures. The header-only fallback in both configure.sh and require_deps.mk now also verifies the library is in ldconfig before reporting the dependency as available. Co-Authored-By: Claude Opus 4.6 --- Common/require_deps.mk | 4 ++-- configure.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common/require_deps.mk b/Common/require_deps.mk index f2010c4d7..28dd59394 100644 --- a/Common/require_deps.mk +++ b/Common/require_deps.mk @@ -53,7 +53,7 @@ ifndef HAVE_FFMPEG # FFmpeg _FFMPEG_CHECK := $(shell pkg-config --exists libavcodec libavformat libavutil 2>/dev/null && echo 1 || echo 0) ifeq ($(_FFMPEG_CHECK),0) - _FFMPEG_CHECK := $(if $(wildcard /usr/include/libavcodec/avcodec.h),1,0) + _FFMPEG_CHECK := $(if $(and $(wildcard /usr/include/libavcodec/avcodec.h),$(shell ldconfig -p 2>/dev/null | grep -q libavcodec && echo y)),1,0) endif HAVE_FFMPEG := $(_FFMPEG_CHECK) ifeq ($(HAVE_FFMPEG),1) @@ -89,7 +89,7 @@ ifndef HAVE_FFMPEG # Vulkan _VULKAN_CHECK := $(shell pkg-config --exists vulkan 2>/dev/null && echo 1 || echo 0) ifeq ($(_VULKAN_CHECK),0) - _VULKAN_CHECK := $(if $(wildcard /usr/include/vulkan/vulkan.h),1,0) + _VULKAN_CHECK := $(if $(and $(wildcard /usr/include/vulkan/vulkan.h),$(shell ldconfig -p 2>/dev/null | grep -q libvulkan && echo y)),1,0) endif HAVE_VULKAN := $(_VULKAN_CHECK) ifeq ($(HAVE_VULKAN),1) diff --git a/configure.sh b/configure.sh index f18f13bf6..d20f512b3 100755 --- a/configure.sh +++ b/configure.sh @@ -89,7 +89,7 @@ if pkg_check libavcodec libavformat libavutil; then HAVE_FFMPEG=1 FFMPEG_CFLAGS="$(pkg_cflags libavcodec libavformat libavutil)" FFMPEG_LIBS="$(pkg_libs libavcodec libavformat libavutil)" -elif [ -f /usr/include/libavcodec/avcodec.h ]; then +elif [ -f /usr/include/libavcodec/avcodec.h ] && ldconfig -p 2>/dev/null | grep -q libavcodec; then HAVE_FFMPEG=1 FFMPEG_LIBS="-lavcodec -lavformat -lavutil" fi @@ -144,7 +144,7 @@ if pkg_check vulkan; then HAVE_VULKAN=1 VULKAN_CFLAGS="$(pkg_cflags vulkan)" VULKAN_LIBS="$(pkg_libs vulkan)" -elif [ -f /usr/include/vulkan/vulkan.h ]; then +elif [ -f /usr/include/vulkan/vulkan.h ] && ldconfig -p 2>/dev/null | grep -q libvulkan; then HAVE_VULKAN=1 VULKAN_LIBS="-lvulkan" fi From ca3bc40ee6b89b6509fb2cff5b03ab06c979e504 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 18:12:41 +0000 Subject: [PATCH 20/36] Remove header-only fallback for FFmpeg/Vulkan detection The header-only fallback (checking /usr/include for headers) causes false positives on SLES where dev headers exist but libraries don't. Rely solely on pkg-config, which only succeeds when dev packages are properly installed with both headers and linkable libraries. Co-Authored-By: Claude Opus 4.6 --- Common/require_deps.mk | 6 ------ configure.sh | 6 ------ 2 files changed, 12 deletions(-) diff --git a/Common/require_deps.mk b/Common/require_deps.mk index 28dd59394..4295c1fbd 100644 --- a/Common/require_deps.mk +++ b/Common/require_deps.mk @@ -52,9 +52,6 @@ ifndef HAVE_FFMPEG # FFmpeg _FFMPEG_CHECK := $(shell pkg-config --exists libavcodec libavformat libavutil 2>/dev/null && echo 1 || echo 0) - ifeq ($(_FFMPEG_CHECK),0) - _FFMPEG_CHECK := $(if $(and $(wildcard /usr/include/libavcodec/avcodec.h),$(shell ldconfig -p 2>/dev/null | grep -q libavcodec && echo y)),1,0) - endif HAVE_FFMPEG := $(_FFMPEG_CHECK) ifeq ($(HAVE_FFMPEG),1) FFMPEG_CFLAGS := $(shell pkg-config --cflags libavcodec libavformat libavutil 2>/dev/null) @@ -88,9 +85,6 @@ ifndef HAVE_FFMPEG # Vulkan _VULKAN_CHECK := $(shell pkg-config --exists vulkan 2>/dev/null && echo 1 || echo 0) - ifeq ($(_VULKAN_CHECK),0) - _VULKAN_CHECK := $(if $(and $(wildcard /usr/include/vulkan/vulkan.h),$(shell ldconfig -p 2>/dev/null | grep -q libvulkan && echo y)),1,0) - endif HAVE_VULKAN := $(_VULKAN_CHECK) ifeq ($(HAVE_VULKAN),1) VULKAN_CFLAGS := $(shell pkg-config --cflags vulkan 2>/dev/null) diff --git a/configure.sh b/configure.sh index d20f512b3..41a1f8799 100755 --- a/configure.sh +++ b/configure.sh @@ -89,9 +89,6 @@ if pkg_check libavcodec libavformat libavutil; then HAVE_FFMPEG=1 FFMPEG_CFLAGS="$(pkg_cflags libavcodec libavformat libavutil)" FFMPEG_LIBS="$(pkg_libs libavcodec libavformat libavutil)" -elif [ -f /usr/include/libavcodec/avcodec.h ] && ldconfig -p 2>/dev/null | grep -q libavcodec; then - HAVE_FFMPEG=1 - FFMPEG_LIBS="-lavcodec -lavformat -lavutil" fi echo " FFmpeg: $([ ${HAVE_FFMPEG} -eq 1 ] && echo yes || echo no)" cat >> "${CONFIG_MK}" << EOF @@ -144,9 +141,6 @@ if pkg_check vulkan; then HAVE_VULKAN=1 VULKAN_CFLAGS="$(pkg_cflags vulkan)" VULKAN_LIBS="$(pkg_libs vulkan)" -elif [ -f /usr/include/vulkan/vulkan.h ] && ldconfig -p 2>/dev/null | grep -q libvulkan; then - HAVE_VULKAN=1 - VULKAN_LIBS="-lvulkan" fi echo " Vulkan: $([ ${HAVE_VULKAN} -eq 1 ] && echo yes || echo no)" cat >> "${CONFIG_MK}" << EOF From 66e13e6eb9df7d382048bc3badaa6a4208f73b78 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 18:54:32 +0000 Subject: [PATCH 21/36] Fix rocdec_decode build on SLES: use config.mk for FFmpeg detection, add -lstdc++fs rocdec_decode had inline pkg-config FFmpeg detection that bypassed the configure system. On SLES, pkg-config found .pc files but libraries couldn't actually be linked. Now uses HAVE_FFMPEG from config.mk/ require_deps.mk instead. Also adds -lstdc++fs to rocdec_decode and video_to_sequence for std::experimental::filesystem symbols needed on older toolchains. Co-Authored-By: Claude Opus 4.6 --- Libraries/rocDecode/rocdec_decode/Makefile | 14 ++++++++------ Libraries/rocDecode/video_to_sequence/Makefile | 2 +- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Libraries/rocDecode/rocdec_decode/Makefile b/Libraries/rocDecode/rocdec_decode/Makefile index f06b01616..b7d82c6e9 100644 --- a/Libraries/rocDecode/rocdec_decode/Makefile +++ b/Libraries/rocDecode/rocdec_decode/Makefile @@ -25,6 +25,9 @@ COMMON_INCLUDE_DIR := ../../../Common EXTERNAL_DIR := ../../../External GPU_RUNTIME := HIP +# Load dependency detection (FFmpeg is optional for this example) +include $(COMMON_INCLUDE_DIR)/require_deps.mk + # HIP variables ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) @@ -45,7 +48,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode +ILDLIBS := -lrocdecode -lstdc++fs ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra @@ -59,11 +62,10 @@ ifeq ($(GPU_RUNTIME), HIP) CPPFLAGS += -DENABLE_HOST_DECODE=0 endif - # Optional FFmpeg - FFMPEG_FOUND := $(shell pkg-config --exists libavcodec libavformat libavutil 2>/dev/null && echo 1) - ifeq ($(FFMPEG_FOUND),1) - ICPPFLAGS += $(shell pkg-config --cflags libavcodec libavformat libavutil) - ILDLIBS += $(shell pkg-config --libs libavcodec libavformat libavutil) + # Optional FFmpeg (uses HAVE_FFMPEG from config.mk / require_deps.mk) + ifeq ($(HAVE_FFMPEG),1) + ICPPFLAGS += $(FFMPEG_CFLAGS) + ILDLIBS += $(FFMPEG_LIBS) endif COMPILER := $(HIPCXX) diff --git a/Libraries/rocDecode/video_to_sequence/Makefile b/Libraries/rocDecode/video_to_sequence/Makefile index c77978c5f..73205d494 100644 --- a/Libraries/rocDecode/video_to_sequence/Makefile +++ b/Libraries/rocDecode/video_to_sequence/Makefile @@ -45,7 +45,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil -lswresample -lpthread +ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil -lswresample -lpthread -lstdc++fs ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra From 3c54d77689474c4ae1522933b54df45af13323e2 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 19:59:08 +0000 Subject: [PATCH 22/36] Add link-test to configure.sh and require_deps.mk to catch missing -dev packages On SLES, FFmpeg .pc files exist (runtime packages) but the actual libraries cannot be linked (-dev packages missing). pkg-config --exists succeeds but linking fails. Now both configure.sh and the require_deps.mk fallback verify that pkg-config libraries can actually be linked by compiling a trivial C program with the reported -l flags. Also integrates rocdec_decode with the configure system (HAVE_FFMPEG) instead of its own inline pkg-config detection. Co-Authored-By: Claude Opus 4.6 --- Common/require_deps.mk | 24 ++++++++++++++++-------- configure.sh | 22 +++++++++++++++++----- 2 files changed, 33 insertions(+), 13 deletions(-) diff --git a/Common/require_deps.mk b/Common/require_deps.mk index 4295c1fbd..a1835cd0f 100644 --- a/Common/require_deps.mk +++ b/Common/require_deps.mk @@ -50,8 +50,10 @@ _REPO_ROOT := $(dir $(COMMON_INCLUDE_DIR)) ifndef HAVE_FFMPEG # Fallback: detect dependencies via pkg-config / file existence - # FFmpeg - _FFMPEG_CHECK := $(shell pkg-config --exists libavcodec libavformat libavutil 2>/dev/null && echo 1 || echo 0) + # FFmpeg (pkg-config + link test to catch missing -dev packages) + _FFMPEG_CHECK := $(shell pkg-config --exists libavcodec libavformat libavutil 2>/dev/null \ + && echo 'int main(){return 0;}' | $${CC:-cc} -x c - $$(pkg-config --libs libavcodec libavformat libavutil) -o /dev/null 2>/dev/null \ + && echo 1 || echo 0) HAVE_FFMPEG := $(_FFMPEG_CHECK) ifeq ($(HAVE_FFMPEG),1) FFMPEG_CFLAGS := $(shell pkg-config --cflags libavcodec libavformat libavutil 2>/dev/null) @@ -61,8 +63,10 @@ ifndef HAVE_FFMPEG FFMPEG_LIBS := endif - # OpenCV - _OPENCV_CHECK := $(shell pkg-config --exists opencv4 2>/dev/null && echo 1 || (pkg-config --exists opencv 2>/dev/null && echo 1 || echo 0)) + # OpenCV (pkg-config + link test) + _OPENCV_CHECK := $(shell (pkg-config --exists opencv4 2>/dev/null && echo 'int main(){return 0;}' | $${CC:-cc} -x c - $$(pkg-config --libs opencv4) -o /dev/null 2>/dev/null && echo 1) \ + || (pkg-config --exists opencv 2>/dev/null && echo 'int main(){return 0;}' | $${CC:-cc} -x c - $$(pkg-config --libs opencv) -o /dev/null 2>/dev/null && echo 1) \ + || echo 0) HAVE_OPENCV := $(_OPENCV_CHECK) ifeq ($(HAVE_OPENCV),1) OPENCV_CFLAGS := $(shell pkg-config --cflags opencv4 2>/dev/null || pkg-config --cflags opencv) @@ -72,8 +76,10 @@ ifndef HAVE_FFMPEG OPENCV_LIBS := endif - # GLFW3 - _GLFW3_CHECK := $(shell pkg-config --exists glfw3 2>/dev/null && echo 1 || echo 0) + # GLFW3 (pkg-config + link test) + _GLFW3_CHECK := $(shell pkg-config --exists glfw3 2>/dev/null \ + && echo 'int main(){return 0;}' | $${CC:-cc} -x c - $$(pkg-config --libs glfw3) -o /dev/null 2>/dev/null \ + && echo 1 || echo 0) HAVE_GLFW3 := $(_GLFW3_CHECK) ifeq ($(HAVE_GLFW3),1) GLFW3_CFLAGS := $(shell pkg-config --cflags glfw3 2>/dev/null) @@ -83,8 +89,10 @@ ifndef HAVE_FFMPEG GLFW3_LIBS := endif - # Vulkan - _VULKAN_CHECK := $(shell pkg-config --exists vulkan 2>/dev/null && echo 1 || echo 0) + # Vulkan (pkg-config + link test) + _VULKAN_CHECK := $(shell pkg-config --exists vulkan 2>/dev/null \ + && echo 'int main(){return 0;}' | $${CC:-cc} -x c - $$(pkg-config --libs vulkan) -o /dev/null 2>/dev/null \ + && echo 1 || echo 0) HAVE_VULKAN := $(_VULKAN_CHECK) ifeq ($(HAVE_VULKAN),1) VULKAN_CFLAGS := $(shell pkg-config --cflags vulkan 2>/dev/null) diff --git a/configure.sh b/configure.sh index 41a1f8799..c885ccfde 100755 --- a/configure.sh +++ b/configure.sh @@ -73,6 +73,18 @@ pkg_libs() { pkg-config --libs "$@" 2>/dev/null || true } +# Helper: verify that libraries from pkg-config can actually be linked. +# On some distros (e.g. SLES), .pc files exist but -dev packages are missing. +# Uses the C compiler to do a link test. +can_link() { + _libs="$(pkg_libs "$@")" + if [ -z "$_libs" ]; then + return 1 + fi + _cc="${CC:-cc}" + echo "int main(){return 0;}" | "$_cc" -x c - $_libs -o /dev/null 2>/dev/null +} + # Start writing config.mk cat > "${CONFIG_MK}" << 'HEADER' # Auto-generated by configure.sh - do not edit @@ -85,7 +97,7 @@ echo "" >> "${CONFIG_MK}" HAVE_FFMPEG=0 FFMPEG_CFLAGS="" FFMPEG_LIBS="" -if pkg_check libavcodec libavformat libavutil; then +if pkg_check libavcodec libavformat libavutil && can_link libavcodec libavformat libavutil; then HAVE_FFMPEG=1 FFMPEG_CFLAGS="$(pkg_cflags libavcodec libavformat libavutil)" FFMPEG_LIBS="$(pkg_libs libavcodec libavformat libavutil)" @@ -101,11 +113,11 @@ EOF HAVE_OPENCV=0 OPENCV_CFLAGS="" OPENCV_LIBS="" -if pkg_check opencv4; then +if pkg_check opencv4 && can_link opencv4; then HAVE_OPENCV=1 OPENCV_CFLAGS="$(pkg_cflags opencv4)" OPENCV_LIBS="$(pkg_libs opencv4)" -elif pkg_check opencv; then +elif pkg_check opencv && can_link opencv; then HAVE_OPENCV=1 OPENCV_CFLAGS="$(pkg_cflags opencv)" OPENCV_LIBS="$(pkg_libs opencv)" @@ -121,7 +133,7 @@ EOF HAVE_GLFW3=0 GLFW3_CFLAGS="" GLFW3_LIBS="" -if pkg_check glfw3; then +if pkg_check glfw3 && can_link glfw3; then HAVE_GLFW3=1 GLFW3_CFLAGS="$(pkg_cflags glfw3)" GLFW3_LIBS="$(pkg_libs glfw3)" @@ -137,7 +149,7 @@ EOF HAVE_VULKAN=0 VULKAN_CFLAGS="" VULKAN_LIBS="" -if pkg_check vulkan; then +if pkg_check vulkan && can_link vulkan; then HAVE_VULKAN=1 VULKAN_CFLAGS="$(pkg_cflags vulkan)" VULKAN_LIBS="$(pkg_libs vulkan)" From 3baedb6227e956123171008ce96f3647df6722b0 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 20:09:16 +0000 Subject: [PATCH 23/36] Improve can_link compiler fallback chain (cc, gcc, clang, ROCm clang) The SLES wheel containers may not have cc/gcc. Try multiple compilers in order, including the ROCm-bundled clang as last resort. If no compiler is found, conservatively report the dependency as missing. Co-Authored-By: Claude Opus 4.6 --- configure.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/configure.sh b/configure.sh index c885ccfde..6f24f6db4 100755 --- a/configure.sh +++ b/configure.sh @@ -75,14 +75,25 @@ pkg_libs() { # Helper: verify that libraries from pkg-config can actually be linked. # On some distros (e.g. SLES), .pc files exist but -dev packages are missing. -# Uses the C compiler to do a link test. +# Tries CC, cc, gcc, clang in order; if none found, assumes not linkable. can_link() { _libs="$(pkg_libs "$@")" if [ -z "$_libs" ]; then return 1 fi - _cc="${CC:-cc}" - echo "int main(){return 0;}" | "$_cc" -x c - $_libs -o /dev/null 2>/dev/null + _test_cc="" + for _try_cc in "${CC}" cc gcc clang "${ROCM_PATH}/lib/llvm/bin/clang"; do + [ -z "$_try_cc" ] && continue + if command -v "$_try_cc" >/dev/null 2>&1; then + _test_cc="$_try_cc" + break + fi + done + if [ -z "$_test_cc" ]; then + # No C compiler found — conservatively say not linkable + return 1 + fi + echo "int main(){return 0;}" | "$_test_cc" -x c - $_libs -o /dev/null 2>/dev/null } # Start writing config.mk From 82eadf0f9c1c2d2d0d70fb9f0c353dc4e7717ca8 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Fri, 20 Mar 2026 20:22:53 +0000 Subject: [PATCH 24/36] Use $(FFMPEG_LIBS) from config.mk instead of hardcoded -lavcodec/-lavformat/-lavutil On SLES tarball, FFmpeg is installed under /usr/local/lib. pkg-config returns -L/usr/local/lib along with the -l flags, but the Makefiles were hardcoding just -lavcodec -lavformat -lavutil without the -L path. The ROCm linker (ld.lld) doesn't search /usr/local/lib by default, so linking failed. Now all 8 rocDecode Makefiles use $(FFMPEG_LIBS) which includes the correct -L path from pkg-config. Co-Authored-By: Claude Opus 4.6 --- Libraries/rocDecode/video_decode/Makefile | 2 +- Libraries/rocDecode/video_decode_batch/Makefile | 2 +- Libraries/rocDecode/video_decode_mem/Makefile | 2 +- Libraries/rocDecode/video_decode_multi_files/Makefile | 2 +- Libraries/rocDecode/video_decode_perf/Makefile | 2 +- Libraries/rocDecode/video_decode_pic_files/Makefile | 2 +- Libraries/rocDecode/video_decode_rgb/Makefile | 2 +- Libraries/rocDecode/video_to_sequence/Makefile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/rocDecode/video_decode/Makefile b/Libraries/rocDecode/video_decode/Makefile index 842989cfb..30392d336 100644 --- a/Libraries/rocDecode/video_decode/Makefile +++ b/Libraries/rocDecode/video_decode/Makefile @@ -52,7 +52,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I .. -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lrocprofiler-register -lavcodec -lavformat -lavutil -lpthread +ILDLIBS := -lrocdecode -lrocprofiler-register $(FFMPEG_LIBS) -lpthread ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_decode_batch/Makefile b/Libraries/rocDecode/video_decode_batch/Makefile index de45fcca9..118d62aff 100644 --- a/Libraries/rocDecode/video_decode_batch/Makefile +++ b/Libraries/rocDecode/video_decode_batch/Makefile @@ -45,7 +45,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lrocprofiler-register -lavcodec -lavformat -lavutil -lpthread -lstdc++fs +ILDLIBS := -lrocdecode -lrocprofiler-register $(FFMPEG_LIBS) -lpthread -lstdc++fs ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_decode_mem/Makefile b/Libraries/rocDecode/video_decode_mem/Makefile index d7024829f..0a0327893 100644 --- a/Libraries/rocDecode/video_decode_mem/Makefile +++ b/Libraries/rocDecode/video_decode_mem/Makefile @@ -45,7 +45,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil +ILDLIBS := -lrocdecode $(FFMPEG_LIBS) ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_decode_multi_files/Makefile b/Libraries/rocDecode/video_decode_multi_files/Makefile index 63bd0574d..3439a3852 100644 --- a/Libraries/rocDecode/video_decode_multi_files/Makefile +++ b/Libraries/rocDecode/video_decode_multi_files/Makefile @@ -45,7 +45,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil +ILDLIBS := -lrocdecode $(FFMPEG_LIBS) ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_decode_perf/Makefile b/Libraries/rocDecode/video_decode_perf/Makefile index a918be6cd..36db9e2f2 100644 --- a/Libraries/rocDecode/video_decode_perf/Makefile +++ b/Libraries/rocDecode/video_decode_perf/Makefile @@ -52,7 +52,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil -lpthread +ILDLIBS := -lrocdecode $(FFMPEG_LIBS) -lpthread ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_decode_pic_files/Makefile b/Libraries/rocDecode/video_decode_pic_files/Makefile index aeff2f08e..cd8b64d45 100644 --- a/Libraries/rocDecode/video_decode_pic_files/Makefile +++ b/Libraries/rocDecode/video_decode_pic_files/Makefile @@ -52,7 +52,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil +ILDLIBS := -lrocdecode $(FFMPEG_LIBS) ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_decode_rgb/Makefile b/Libraries/rocDecode/video_decode_rgb/Makefile index 85903fbdf..374d82d04 100644 --- a/Libraries/rocDecode/video_decode_rgb/Makefile +++ b/Libraries/rocDecode/video_decode_rgb/Makefile @@ -45,7 +45,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil -lswresample -lpthread +ILDLIBS := -lrocdecode $(FFMPEG_LIBS) -lswresample -lpthread ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra diff --git a/Libraries/rocDecode/video_to_sequence/Makefile b/Libraries/rocDecode/video_to_sequence/Makefile index 73205d494..1d59b459f 100644 --- a/Libraries/rocDecode/video_to_sequence/Makefile +++ b/Libraries/rocDecode/video_to_sequence/Makefile @@ -45,7 +45,7 @@ CXX_STD := c++17 ICXXFLAGS := -std=$(CXX_STD) ICPPFLAGS := -isystem $(ROCDECODE_INCLUDE_DIR) -I $(COMMON_INCLUDE_DIR) -I $(EXTERNAL_DIR) -I $(UTILS_DIR) -I $(UTILS_DIR)/rocvideodecode ILDFLAGS := -L $(ROCM_INSTALL_DIR)/lib -ILDLIBS := -lrocdecode -lavcodec -lavformat -lavutil -lswresample -lpthread -lstdc++fs +ILDLIBS := -lrocdecode $(FFMPEG_LIBS) -lswresample -lpthread -lstdc++fs ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra From 1fac6e3ac59c48d2397ece0dbdbe5875dc5b131f Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 15:30:38 +0000 Subject: [PATCH 25/36] Use ctest JUnit XML results for Makefile test allow list Replace `ctest -N` + grep/sed (which listed *registered* tests) with `ctest --output-junit` + a Python script that parses the JUnit XML to extract tests that ctest *actually ran*. This ensures true parity between CMake and Makefile test sets. Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/parse_ctest_results.py | 46 +++++++++++++++++++ .../build-rocm-examples-reusable.yml | 11 +++-- 2 files changed, 52 insertions(+), 5 deletions(-) create mode 100644 .github/build_tools/parse_ctest_results.py diff --git a/.github/build_tools/parse_ctest_results.py b/.github/build_tools/parse_ctest_results.py new file mode 100644 index 000000000..a98b2b2cb --- /dev/null +++ b/.github/build_tools/parse_ctest_results.py @@ -0,0 +1,46 @@ +#!/usr/bin/env python3 +"""Parse ctest JUnit XML results and extract test names that actually ran. + +Used by the Makefile test step to only run tests that ctest executed, +ensuring parity between CMake and Makefile test sets. +""" + +import argparse +import sys +import xml.etree.ElementTree as ET + + +def main(): + parser = argparse.ArgumentParser( + description="Extract test names from ctest JUnit XML results." + ) + parser.add_argument( + "--junit", required=True, help="Path to ctest JUnit XML file" + ) + parser.add_argument( + "--output", required=True, help="Output file (one test name per line)" + ) + args = parser.parse_args() + + try: + tree = ET.parse(args.junit) + except (ET.ParseError, FileNotFoundError) as e: + print(f"Error reading {args.junit}: {e}", file=sys.stderr) + sys.exit(1) + + root = tree.getroot() + test_names = [] + for testcase in root.iter("testcase"): + name = testcase.get("name") + if name: + test_names.append(name) + + with open(args.output, "w") as f: + for name in test_names: + f.write(name + "\n") + + print(f"Extracted {len(test_names)} test names from ctest JUnit results") + + +if __name__ == "__main__": + main() diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 13971e364..f51041a5b 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -179,7 +179,7 @@ jobs: echo "No tests skipped." >> $GITHUB_STEP_SUMMARY fi - ctest --test-dir build --output-on-failure --exclude-from-file "${SKIP_FILE}" 2>&1 | tee ctest_output.log + ctest --test-dir build --output-on-failure --exclude-from-file "${SKIP_FILE}" --output-junit build/ctest_results.xml 2>&1 | tee ctest_output.log - name: Test summary if: ${{ !cancelled() }} @@ -225,9 +225,10 @@ jobs: - name: Makefile tests if: ${{ !cancelled() }} run: | - # Extract the list of registered ctest test names - ctest --test-dir build -N | grep ' Test #' | sed 's/.*: //' > /tmp/ctest_test_names.txt - echo "ctest registered $(wc -l < /tmp/ctest_test_names.txt) tests" + # Extract test names that ctest actually ran from JUnit XML results + python3 .github/build_tools/parse_ctest_results.py \ + --junit build/ctest_results.xml \ + --output /tmp/ctest_ran_tests.txt # Generate skip list with --makefile to include tests that need CMake test data python3 .github/build_tools/generate_skip_tests.py \ @@ -237,7 +238,7 @@ jobs: SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" ./run_makefile_tests.sh \ - --allow-file=/tmp/ctest_test_names.txt \ + --allow-file=/tmp/ctest_ran_tests.txt \ --skip-file="${SKIP_FILE}" \ --timeout=120 From d258066e434fb39817e54c83bb14eb9345b79070 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 15:44:50 +0000 Subject: [PATCH 26/36] Skip rocprof-systems-basic (too slow) and rocprof-systems-advanced (fails) Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/generate_skip_tests.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/build_tools/generate_skip_tests.py b/.github/build_tools/generate_skip_tests.py index 406d3fe97..b8ec59be3 100644 --- a/.github/build_tools/generate_skip_tests.py +++ b/.github/build_tools/generate_skip_tests.py @@ -15,6 +15,14 @@ "rocdecode_rocdec_decode", ] +# Tests to always skip (all targets, all distros). +ALWAYS_SKIP_TESTS = [ + # rocprof-systems-basic passes but takes ~6 minutes + "rocprof-systems-basic", + # rocprof-systems-advanced fails + "rocprof-systems-advanced", +] + # Tests to skip per GPU target (one list per target that has skips) SKIP_TESTS = { "gfx1151": [ @@ -73,7 +81,10 @@ def main(): ) args = parser.parse_args() - lines = list(SKIP_TESTS.get(args.target, [])) + lines = list(ALWAYS_SKIP_TESTS) + for test in SKIP_TESTS.get(args.target, []): + if test not in lines: + lines.append(test) if args.makefile: for test in MAKEFILE_SKIP_TESTS: From f75213cdd10547cfa46cb23bcbf03edb61407d42 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 15:46:15 +0000 Subject: [PATCH 27/36] Fix ctest JUnit XML path: use absolute GITHUB_WORKSPACE path --output-junit path was relative and may not resolve correctly with --test-dir. Use absolute path via GITHUB_WORKSPACE. Also handle missing XML gracefully (empty allow list if ctest didn't run). Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/parse_ctest_results.py | 10 ++++++++-- .github/workflows/build-rocm-examples-reusable.yml | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/build_tools/parse_ctest_results.py b/.github/build_tools/parse_ctest_results.py index a98b2b2cb..3109627c6 100644 --- a/.github/build_tools/parse_ctest_results.py +++ b/.github/build_tools/parse_ctest_results.py @@ -24,8 +24,14 @@ def main(): try: tree = ET.parse(args.junit) - except (ET.ParseError, FileNotFoundError) as e: - print(f"Error reading {args.junit}: {e}", file=sys.stderr) + except FileNotFoundError: + print(f"Warning: {args.junit} not found (ctest may not have run)") + print("Creating empty allow list — no Makefile tests will run") + with open(args.output, "w") as f: + pass + return + except ET.ParseError as e: + print(f"Error parsing {args.junit}: {e}", file=sys.stderr) sys.exit(1) root = tree.getroot() diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index f51041a5b..8b2ef120b 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -179,7 +179,7 @@ jobs: echo "No tests skipped." >> $GITHUB_STEP_SUMMARY fi - ctest --test-dir build --output-on-failure --exclude-from-file "${SKIP_FILE}" --output-junit build/ctest_results.xml 2>&1 | tee ctest_output.log + ctest --test-dir build --output-on-failure --exclude-from-file "${SKIP_FILE}" --output-junit "${GITHUB_WORKSPACE}/ctest_results.xml" 2>&1 | tee ctest_output.log - name: Test summary if: ${{ !cancelled() }} @@ -227,7 +227,7 @@ jobs: run: | # Extract test names that ctest actually ran from JUnit XML results python3 .github/build_tools/parse_ctest_results.py \ - --junit build/ctest_results.xml \ + --junit "${GITHUB_WORKSPACE}/ctest_results.xml" \ --output /tmp/ctest_ran_tests.txt # Generate skip list with --makefile to include tests that need CMake test data From 2084f9f9f3567de7f77203863453fb5bea29b7b7 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 16:05:10 +0000 Subject: [PATCH 28/36] Match ctest output format in Makefile test runner Output now matches ctest style: - " Start N: test_name" before each test - "N/total Test #N: test_name .... Passed X.XX sec" with dot padding - Per-test timing in seconds - "X% tests passed, Y tests failed out of Z" summary - "Total Test time (real) = N.00 sec" footer - Skipped tests excluded from output (matching --exclude-from-file) Co-Authored-By: Claude Opus 4.6 --- run_makefile_tests.sh | 109 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 88 insertions(+), 21 deletions(-) diff --git a/run_makefile_tests.sh b/run_makefile_tests.sh index cf3abe892..45f1f0f22 100755 --- a/run_makefile_tests.sh +++ b/run_makefile_tests.sh @@ -121,47 +121,94 @@ if [ "${USE_ALLOW_LIST}" -eq 1 ]; then mv "${FILTERED_LIST}" "${TESTS_LIST}" fi +# Filter out skipped tests (matching ctest --exclude-from-file behavior) +FILTERED_LIST="/tmp/makefile_tests_filtered_$$.txt" +while IFS='|' read -r dir example_name test_args; do + if ! is_skipped "${example_name}"; then + echo "${dir}|${example_name}|${test_args}" + fi +done < "${TESTS_LIST}" > "${FILTERED_LIST}" +SKIPPED_COUNT=$(($(wc -l < "${TESTS_LIST}") - $(wc -l < "${FILTERED_LIST}"))) +mv "${FILTERED_LIST}" "${TESTS_LIST}" + NUM_TESTS=$(wc -l < "${TESTS_LIST}") echo "" -echo "Found ${NUM_BUILT} Makefile-built executable(s)" -if [ "${USE_ALLOW_LIST}" -eq 1 ]; then - echo "Allow file: ${ALLOW_FILE} ($(wc -l < "${ALLOW_FILE}") ctest entries, ${NUM_TESTS} matched)" -fi -if [ -n "${SKIP_FILE}" ] && [ -f "${SKIP_FILE}" ] && [ -s "${SKIP_FILE}" ]; then - echo "Skip file: ${SKIP_FILE} ($(wc -l < "${SKIP_FILE}") entries)" +echo "Found ${NUM_BUILT} Makefile-built executable(s), ${NUM_TESTS} to run" +if [ "${SKIPPED_COUNT}" -gt 0 ]; then + echo "Excluded ${SKIPPED_COUNT} test(s) via skip list" fi echo "" PASSED=0 FAILED=0 -SKIPPED=0 CURRENT=0 FAILED_TESTS="" +LINE_WIDTH=72 +START_TIME=$(date +%s) + +# Helper: print ctest-style result line with dot padding +# Format: "N/total Test #N: name ..... Passed X.XX sec" +print_result() { + _current="$1" + _total="$2" + _num="$3" + _name="$4" + _result="$5" + _time="$6" + _prefix=$(printf "%d/%d Test #%d: %s " "$_current" "$_total" "$_num" "$_name") + _suffix=$(printf " %s %8s sec" "$_result" "$_time") + _prefix_len=$(printf "%s" "$_prefix" | wc -c) + _suffix_len=$(printf "%s" "$_suffix" | wc -c) + _dots_needed=$((LINE_WIDTH - _prefix_len - _suffix_len)) + if [ "$_dots_needed" -lt 3 ]; then + _dots_needed=3 + fi + _dots=$(printf '%*s' "$_dots_needed" '' | tr ' ' '.') + printf "%s%s%s\n" "$_prefix" "$_dots" "$_suffix" +} # Run tests while IFS='|' read -r dir example_name test_args; do CURRENT=$((CURRENT + 1)) - if is_skipped "${example_name}"; then - SKIPPED=$((SKIPPED + 1)) - printf "(%d/%d) SKIP %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" - continue - fi + # Print "Start" line (ctest style) + printf " Start %d: %s\n" "${CURRENT}" "${example_name}" # Run the test from its own directory (so data files are found) - printf "(%d/%d) RUN %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" + test_start=$(date +%s%N 2>/dev/null || date +%s) if (cd "${dir}" && timeout "${TIMEOUT}" "./${example_name}" ${test_args}) > "/tmp/test_${example_name}.log" 2>&1; then + test_end=$(date +%s%N 2>/dev/null || date +%s) + # Calculate elapsed time in seconds with 2 decimal places + if [ ${#test_start} -gt 10 ]; then + elapsed=$(( (test_end - test_start) )) + elapsed_sec=$((elapsed / 1000000000)) + elapsed_ms=$(( (elapsed % 1000000000) / 10000000 )) + elapsed_fmt=$(printf "%d.%02d" "$elapsed_sec" "$elapsed_ms") + else + elapsed_fmt=$(( test_end - test_start )) + elapsed_fmt="${elapsed_fmt}.00" + fi PASSED=$((PASSED + 1)) - printf "(%d/%d) PASS %s\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" + print_result "${CURRENT}" "${NUM_TESTS}" "${CURRENT}" "${example_name}" "Passed" "${elapsed_fmt}" else exit_code=$? + test_end=$(date +%s%N 2>/dev/null || date +%s) + if [ ${#test_start} -gt 10 ]; then + elapsed=$(( (test_end - test_start) )) + elapsed_sec=$((elapsed / 1000000000)) + elapsed_ms=$(( (elapsed % 1000000000) / 10000000 )) + elapsed_fmt=$(printf "%d.%02d" "$elapsed_sec" "$elapsed_ms") + else + elapsed_fmt=$(( test_end - test_start )) + elapsed_fmt="${elapsed_fmt}.00" + fi FAILED=$((FAILED + 1)) FAILED_TESTS="${FAILED_TESTS} ${example_name}" if [ "${exit_code}" -eq 124 ]; then - printf "(%d/%d) TIMEOUT %s (after %ss)\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" "${TIMEOUT}" + print_result "${CURRENT}" "${NUM_TESTS}" "${CURRENT}" "${example_name}" "Timeout" "${elapsed_fmt}" else - printf "(%d/%d) FAIL %s (exit code %d)\n" "${CURRENT}" "${NUM_TESTS}" "${example_name}" "${exit_code}" + print_result "${CURRENT}" "${NUM_TESTS}" "${CURRENT}" "${example_name}" "***Failed" "${elapsed_fmt}" fi # Print last 20 lines of output for failed tests echo "--- output (last 20 lines) ---" @@ -172,14 +219,34 @@ done < "${TESTS_LIST}" rm -f "${TESTS_LIST}" +END_TIME=$(date +%s) +TOTAL_TIME=$((END_TIME - START_TIME)) + echo "" -echo "==========================================" RAN=$((PASSED + FAILED)) -echo "Makefile test results: ${RAN} tests ran, ${PASSED} passed, ${FAILED} failed, ${SKIPPED} skipped (${NUM_TESTS} total)" -echo "==========================================" +if [ "${FAILED}" -eq 0 ]; then + PERCENT=100 +elif [ "${RAN}" -gt 0 ]; then + PERCENT=$(( (PASSED * 100) / RAN )) +else + PERCENT=0 +fi -if [ -n "${FAILED_TESTS}" ]; then +if [ "${FAILED}" -eq 0 ]; then + printf "%d%% tests passed, %d tests failed out of %d\n" "${PERCENT}" "${FAILED}" "${RAN}" +else + printf "%d%% tests passed, %d tests failed out of %d\n" "${PERCENT}" "${FAILED}" "${RAN}" echo "" - echo "Failed tests:${FAILED_TESTS}" + echo "The following tests FAILED:" + _fail_num=0 + for t in ${FAILED_TESTS}; do + _fail_num=$((_fail_num + 1)) + printf " %d - %s (Failed)\n" "${_fail_num}" "$t" + done +fi + +printf "\nTotal Test time (real) = %d.00 sec\n" "${TOTAL_TIME}" + +if [ -n "${FAILED_TESTS}" ]; then exit 1 fi From 96384931d026006055900507904fe5bec9baa161 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 18:36:33 +0000 Subject: [PATCH 29/36] Skip hip_calling_global_functions on AlmaLinux 8 (glibc 2.28 too old) Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/generate_skip_tests.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/build_tools/generate_skip_tests.py b/.github/build_tools/generate_skip_tests.py index b8ec59be3..a3b5ba94e 100644 --- a/.github/build_tools/generate_skip_tests.py +++ b/.github/build_tools/generate_skip_tests.py @@ -46,6 +46,8 @@ DISTRO_SKIP_TESTS = { # AlmaLinux 8 has glibc 2.28; binaries compiled against 2.34+ fail at runtime "gfx1100:almalinux-8": [ + # glibc 2.28 too old — binaries compiled against 2.34+ fail at runtime + "hip_calling_global_functions", "hip_template_warp_size_reduction", "hip_warp_size_reduction", # hipSPARSELt Tensile library files not packaged for this target From 53449136b303090af1305875d808e51222535219 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 18:39:55 +0000 Subject: [PATCH 30/36] Only run Makefile tests for tests that passed in ctest Filter JUnit XML to only include passed tests (no element). Tests that failed in ctest won't be retried via the Makefile runner. Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/parse_ctest_results.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/build_tools/parse_ctest_results.py b/.github/build_tools/parse_ctest_results.py index 3109627c6..3d422fc46 100644 --- a/.github/build_tools/parse_ctest_results.py +++ b/.github/build_tools/parse_ctest_results.py @@ -35,17 +35,24 @@ def main(): sys.exit(1) root = tree.getroot() - test_names = [] + passed = [] + failed = [] for testcase in root.iter("testcase"): name = testcase.get("name") - if name: - test_names.append(name) + if not name: + continue + # In JUnit XML, failed tests have a child element + if testcase.find("failure") is not None: + failed.append(name) + else: + passed.append(name) with open(args.output, "w") as f: - for name in test_names: + for name in passed: f.write(name + "\n") - print(f"Extracted {len(test_names)} test names from ctest JUnit results") + total = len(passed) + len(failed) + print(f"Extracted {len(passed)} passed tests from {total} ctest results ({len(failed)} failed, excluded)") if __name__ == "__main__": From c21f2359da1926b28a74dc575cb8a9bd8892df43 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Mon, 23 Mar 2026 20:29:11 +0000 Subject: [PATCH 31/36] Update README: document configure.sh and Makefile test runner Add instructions for running configure.sh before Make builds to detect external dependencies, and document run_makefile_tests.sh usage. Co-Authored-By: Claude Opus 4.6 --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index cef8ec066..f26afb165 100644 --- a/README.md +++ b/README.md @@ -51,12 +51,28 @@ See [CMake build options](#cmake-build-options) for an overview of build options #### Make -Beware that only a subset of the examples support building via Make. +Only a subset of the examples support building via Make. Some examples depend on external libraries (e.g. FFmpeg, OpenCV, GLFW3, Vulkan). Run `configure.sh` before building to detect which dependencies are available — examples with missing dependencies will be skipped automatically. - `$ git clone https://github.com/ROCm/rocm-examples.git` - `$ cd rocm-examples` +- `$ ./configure.sh` - `$ make` (on ROCm) or `$ make ROCM_EXAMPLES_GPU_LANGUAGE=CUDA` (on CUDA) +The configure script writes a `config.mk` file that each Makefile includes to check for required dependencies. To rebuild after installing new libraries, re-run `./configure.sh` and then `make clean && make`. + +#### Makefile Testing + +After building, you can run the Makefile-built examples as tests: + +``` +$ ./run_makefile_tests.sh --timeout=120 +``` + +Options: +- `--allow-file=FILE` — only run tests listed in this file (one name per line) +- `--skip-file=FILE` — skip tests listed in this file +- `--timeout=SECONDS` — per-test timeout (default: 120) + ### Linux with Docker Alternatively, instead of installing the prerequisites on the system, the [Dockerfiles](https://github.com/ROCm/rocm-examples/tree/amd-staging/Dockerfiles/) in this repository can be used to build images that provide all required prerequisites. Note, that the ROCm kernel GPU driver still needs to be installed on the host system. From 15dd987653962567d2c6759f597b8e637226f13b Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 24 Mar 2026 15:04:13 +0000 Subject: [PATCH 32/36] Move test summary to end, add Makefile test log uploads - Move Test summary step after Makefile tests so it covers both - Add CMake and Makefile test results to the GitHub step summary - Upload Makefile test output as a separate artifact - Remove duplicate skipped-tests output from ctest step (now in summary) Co-Authored-By: Claude Opus 4.6 --- .../build-rocm-examples-reusable.yml | 139 +++++++++++------- 1 file changed, 86 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 8b2ef120b..0c27f795f 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -168,87 +168,120 @@ jobs: python3 .github/build_tools/generate_skip_tests.py --target ${{ matrix.gpu_config.gpu_target }} --distro ${{ inputs.distro }} SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" - if [ -s "${SKIP_FILE}" ]; then - echo "## Skipped tests" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo '```' >> $GITHUB_STEP_SUMMARY - cat "${SKIP_FILE}" >> $GITHUB_STEP_SUMMARY - echo '```' >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - else - echo "No tests skipped." >> $GITHUB_STEP_SUMMARY - fi - ctest --test-dir build --output-on-failure --exclude-from-file "${SKIP_FILE}" --output-junit "${GITHUB_WORKSPACE}/ctest_results.xml" 2>&1 | tee ctest_output.log - - name: Test summary + - name: Makefile tests if: ${{ !cancelled() }} run: | - LAST_TEST_LOG="build/Testing/Temporary/LastTest.log" - if [ ! -f ctest_output.log ] || [ ! -f "${LAST_TEST_LOG}" ]; then - echo "No test logs found." >> $GITHUB_STEP_SUMMARY - exit 0 - fi + # Extract test names that ctest actually ran from JUnit XML results + python3 .github/build_tools/parse_ctest_results.py \ + --junit "${GITHUB_WORKSPACE}/ctest_results.xml" \ + --output /tmp/ctest_ran_tests.txt - echo "## Test summary" >> $GITHUB_STEP_SUMMARY + # Generate skip list with --makefile to include tests that need CMake test data + python3 .github/build_tools/generate_skip_tests.py \ + --target ${{ matrix.gpu_config.gpu_target }} \ + --distro ${{ inputs.distro }} \ + --makefile + SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" + + ./run_makefile_tests.sh \ + --allow-file=/tmp/ctest_ran_tests.txt \ + --skip-file="${SKIP_FILE}" \ + --timeout=120 2>&1 | tee makefile_test_output.log + + - name: Test summary + if: ${{ !cancelled() }} + run: | + # --- CMake test summary --- + echo "## CMake Test Summary" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - SUMMARY=$(grep "tests passed" ctest_output.log) - echo "**${SUMMARY}**" >> $GITHUB_STEP_SUMMARY + if [ -f ctest_output.log ]; then + SUMMARY=$(grep "tests passed" ctest_output.log || echo "No ctest results found") + echo "**${SUMMARY}**" >> $GITHUB_STEP_SUMMARY + else + echo "No ctest output log found." >> $GITHUB_STEP_SUMMARY + fi FAILED_LOG="build/Testing/Temporary/LastTestsFailed.log" if [ -s "${FAILED_LOG}" ]; then - echo "## Failed tests" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Failed CMake tests" >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY cat "${FAILED_LOG}" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY echo "" >> $GITHUB_STEP_SUMMARY - echo "
Failed tests output" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo '```' >> $GITHUB_STEP_SUMMARY + LAST_TEST_LOG="build/Testing/Temporary/LastTest.log" + if [ -f "${LAST_TEST_LOG}" ]; then + echo "
Failed tests output" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + + awk ' + /^[0-9]+\/[0-9]+ Testing: / { if (inblock && failed) print block; block = $0; inblock = 1; failed = 0; seen_result = 0; next } + inblock { block = block "\n" $0 } + /^Test Failed\.$/ { failed = 1; seen_result = 1 } + /^Test Passed\.$/ { seen_result = 1 } + /^-+$/ { if (inblock && seen_result) { if (failed) print block; inblock = 0 } } + END { if (inblock && failed) print block } + ' "${LAST_TEST_LOG}" >> $GITHUB_STEP_SUMMARY + + echo '```' >> $GITHUB_STEP_SUMMARY + echo "
" >> $GITHUB_STEP_SUMMARY + fi + fi - awk ' - /^[0-9]+\/[0-9]+ Testing: / { if (inblock && failed) print block; block = $0; inblock = 1; failed = 0; seen_result = 0; next } - inblock { block = block "\n" $0 } - /^Test Failed\.$/ { failed = 1; seen_result = 1 } - /^Test Passed\.$/ { seen_result = 1 } - /^-+$/ { if (inblock && seen_result) { if (failed) print block; inblock = 0 } } - END { if (inblock && failed) print block } - ' "${LAST_TEST_LOG}" >> $GITHUB_STEP_SUMMARY + # --- Makefile test summary --- + echo "" >> $GITHUB_STEP_SUMMARY + echo "## Makefile Test Summary" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY - echo '```' >> $GITHUB_STEP_SUMMARY - echo "
" >> $GITHUB_STEP_SUMMARY + if [ -f makefile_test_output.log ]; then + MAKEFILE_SUMMARY=$(grep "tests passed\|tests failed" makefile_test_output.log | tail -1 || echo "No Makefile test results found") + echo "**${MAKEFILE_SUMMARY}**" >> $GITHUB_STEP_SUMMARY + + # Show any failed Makefile tests + MAKEFILE_FAILURES=$(grep "Failed" makefile_test_output.log | grep -v "^[[:space:]]*$" || true) + if [ -n "${MAKEFILE_FAILURES}" ]; then + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Failed Makefile tests" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + echo "${MAKEFILE_FAILURES}" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + fi + else + echo "No Makefile test output found." >> $GITHUB_STEP_SUMMARY fi - - name: Makefile tests - if: ${{ !cancelled() }} - run: | - # Extract test names that ctest actually ran from JUnit XML results - python3 .github/build_tools/parse_ctest_results.py \ - --junit "${GITHUB_WORKSPACE}/ctest_results.xml" \ - --output /tmp/ctest_ran_tests.txt - - # Generate skip list with --makefile to include tests that need CMake test data - python3 .github/build_tools/generate_skip_tests.py \ - --target ${{ matrix.gpu_config.gpu_target }} \ - --distro ${{ inputs.distro }} \ - --makefile + # --- Skipped tests --- SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" + if [ -s "${SKIP_FILE}" ]; then + echo "" >> $GITHUB_STEP_SUMMARY + echo "## Skipped tests" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + cat "${SKIP_FILE}" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + fi - ./run_makefile_tests.sh \ - --allow-file=/tmp/ctest_ran_tests.txt \ - --skip-file="${SKIP_FILE}" \ - --timeout=120 - - - name: Upload test logs + - name: Upload CMake test logs if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: name: ctest-logs-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} path: build/Testing/Temporary/ + - name: Upload Makefile test logs + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: makefile-test-logs-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} + path: makefile_test_output.log + - name: Clean the workspace if: always() run: find "$GITHUB_WORKSPACE" -mindepth 1 -delete From dabc5d0b02e7112dbaf2da2ce2fe999c589a9a8e Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 24 Mar 2026 15:37:47 +0000 Subject: [PATCH 33/36] Add Makefile build artifact upload Collect Makefile-built executables into a staging directory and upload them as a separate artifact, matching the CMake build artifact upload. Co-Authored-By: Claude Opus 4.6 --- .../build-rocm-examples-reusable.yml | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 0c27f795f..55838971b 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -114,6 +114,26 @@ jobs: ./configure.sh --rocm-path="${ROCM_PATH}" make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" + - name: Collect Makefile build artifacts + if: ${{ !cancelled() }} + run: | + mkdir -p /tmp/makefile_build + find . -name Makefile -not -path './build/*' | while IFS= read -r makefile; do + dir=$(dirname "$makefile") + example_name=$(grep '^EXAMPLE := ' "$makefile" 2>/dev/null | head -1 | sed 's/^EXAMPLE := //') + if [ -n "${example_name}" ] && [ -x "${dir}/${example_name}" ]; then + mkdir -p "/tmp/makefile_build/${dir}" + cp "${dir}/${example_name}" "/tmp/makefile_build/${dir}/" + fi + done + + - name: Upload Makefile build artifacts + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: makefile-build-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} + path: /tmp/makefile_build/ + - name: CMake configure if: ${{ !cancelled() }} run: | From 85b25b386a4884a5eb23f22f978af5664e0ecbbe Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 24 Mar 2026 15:43:35 +0000 Subject: [PATCH 34/36] Add if: !cancelled() guard to Makefile build step Ensures subsequent steps (CMake, tests, uploads) still run even if the Makefile build fails, while still marking the workflow as failed. Co-Authored-By: Claude Opus 4.6 --- .github/workflows/build-rocm-examples-reusable.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 55838971b..3b1f597c9 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -110,6 +110,7 @@ jobs: echo "HIPCC_COMPILE_FLAGS_APPEND=--offload-arch=${{ matrix.gpu_config.gpu_target }}" >> $GITHUB_ENV - name: Makefile build + if: ${{ !cancelled() }} run: | ./configure.sh --rocm-path="${ROCM_PATH}" make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" From c88873dddd5b143def38e9ab11e3b48bd49eb535 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 24 Mar 2026 17:54:50 +0000 Subject: [PATCH 35/36] Group build artifact uploads together after both builds complete Move CMake and Makefile build uploads to the same location, after both CMake and Makefile builds finish, so artifacts are logically grouped. Co-Authored-By: Claude Opus 4.6 --- .../build-rocm-examples-reusable.yml | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 3b1f597c9..6450085e3 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -115,26 +115,6 @@ jobs: ./configure.sh --rocm-path="${ROCM_PATH}" make -j ROCM_INSTALL_DIR="${ROCM_PATH}" HIP_ARCHITECTURES="${{ matrix.gpu_config.gpu_target }}" - - name: Collect Makefile build artifacts - if: ${{ !cancelled() }} - run: | - mkdir -p /tmp/makefile_build - find . -name Makefile -not -path './build/*' | while IFS= read -r makefile; do - dir=$(dirname "$makefile") - example_name=$(grep '^EXAMPLE := ' "$makefile" 2>/dev/null | head -1 | sed 's/^EXAMPLE := //') - if [ -n "${example_name}" ] && [ -x "${dir}/${example_name}" ]; then - mkdir -p "/tmp/makefile_build/${dir}" - cp "${dir}/${example_name}" "/tmp/makefile_build/${dir}/" - fi - done - - - name: Upload Makefile build artifacts - if: ${{ !cancelled() }} - uses: actions/upload-artifact@v4 - with: - name: makefile-build-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} - path: /tmp/makefile_build/ - - name: CMake configure if: ${{ !cancelled() }} run: | @@ -176,13 +156,33 @@ jobs: run: | cmake --build build -j - - name: Upload build artifacts + - name: Collect Makefile build artifacts + if: ${{ !cancelled() }} + run: | + mkdir -p /tmp/makefile_build + find . -name Makefile -not -path './build/*' | while IFS= read -r makefile; do + dir=$(dirname "$makefile") + example_name=$(grep '^EXAMPLE := ' "$makefile" 2>/dev/null | head -1 | sed 's/^EXAMPLE := //') + if [ -n "${example_name}" ] && [ -x "${dir}/${example_name}" ]; then + mkdir -p "/tmp/makefile_build/${dir}" + cp "${dir}/${example_name}" "/tmp/makefile_build/${dir}/" + fi + done + + - name: Upload CMake build artifacts if: ${{ !cancelled() }} uses: actions/upload-artifact@v4 with: name: rocm-examples-build-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} path: build/ + - name: Upload Makefile build artifacts + if: ${{ !cancelled() }} + uses: actions/upload-artifact@v4 + with: + name: makefile-build-${{ inputs.distro }}-${{ matrix.gpu_config.gpu_target }}-${{ steps.sanity-check.outputs.rocm_version || steps.install-tarball.outputs.rocm_version }}-${{ matrix.install_method }} + path: /tmp/makefile_build/ + - name: Run tests if: ${{ !cancelled() }} run: | From f49e54e77d502413232f04c81f3862f37324c676 Mon Sep 17 00:00:00 2001 From: sshi-amd Date: Tue, 24 Mar 2026 20:27:22 +0000 Subject: [PATCH 36/36] Remove ALWAYS_SKIP_TESTS entries for clean CI validation Co-Authored-By: Claude Opus 4.6 --- .github/build_tools/generate_skip_tests.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/build_tools/generate_skip_tests.py b/.github/build_tools/generate_skip_tests.py index a3b5ba94e..4a398d344 100644 --- a/.github/build_tools/generate_skip_tests.py +++ b/.github/build_tools/generate_skip_tests.py @@ -17,10 +17,6 @@ # Tests to always skip (all targets, all distros). ALWAYS_SKIP_TESTS = [ - # rocprof-systems-basic passes but takes ~6 minutes - "rocprof-systems-basic", - # rocprof-systems-advanced fails - "rocprof-systems-advanced", ] # Tests to skip per GPU target (one list per target that has skips) @@ -44,16 +40,6 @@ # Tests to skip for a specific GPU target + distro combination. # Keys are ":", e.g. "gfx1151:sles-15.7". DISTRO_SKIP_TESTS = { - # AlmaLinux 8 has glibc 2.28; binaries compiled against 2.34+ fail at runtime - "gfx1100:almalinux-8": [ - # glibc 2.28 too old — binaries compiled against 2.34+ fail at runtime - "hip_calling_global_functions", - "hip_template_warp_size_reduction", - "hip_warp_size_reduction", - # hipSPARSELt Tensile library files not packaged for this target - "hipsparselt_spmm", - "hipsparselt_spmm_advanced", - ], }