diff --git a/.github/build_tools/generate_skip_tests.py b/.github/build_tools/generate_skip_tests.py index 3aefee99d..4a398d344 100644 --- a/.github/build_tools/generate_skip_tests.py +++ b/.github/build_tools/generate_skip_tests.py @@ -8,6 +8,17 @@ 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 always skip (all targets, all distros). +ALWAYS_SKIP_TESTS = [ +] + # Tests to skip per GPU target (one list per target that has skips) SKIP_TESTS = { "gfx1151": [ @@ -29,8 +40,6 @@ # 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"], } @@ -53,9 +62,22 @@ 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, [])) + 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: + if test not in lines: + lines.append(test) if args.distro: combo_key = f"{args.target}:{args.distro}" diff --git a/.github/build_tools/parse_ctest_results.py b/.github/build_tools/parse_ctest_results.py new file mode 100644 index 000000000..3d422fc46 --- /dev/null +++ b/.github/build_tools/parse_ctest_results.py @@ -0,0 +1,59 @@ +#!/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 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() + passed = [] + failed = [] + for testcase in root.iter("testcase"): + name = testcase.get("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 passed: + f.write(name + "\n") + + total = len(passed) + len(failed) + print(f"Extracted {len(passed)} passed tests from {total} ctest results ({len(failed)} failed, excluded)") + + +if __name__ == "__main__": + main() diff --git a/.github/workflows/build-rocm-examples-reusable.yml b/.github/workflows/build-rocm-examples-reusable.yml index 399903f88..6450085e3 100644 --- a/.github/workflows/build-rocm-examples-reusable.yml +++ b/.github/workflows/build-rocm-examples-reusable.yml @@ -68,12 +68,14 @@ 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 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' }} @@ -98,14 +100,23 @@ 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 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 + if: ${{ !cancelled() }} + run: | + ./configure.sh --rocm-path="${ROCM_PATH}" + 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) @@ -141,82 +152,157 @@ jobs: fi - name: CMake build + if: ${{ !cancelled() }} run: | cmake --build build -j - - name: Upload build artifacts - if: success() + - 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: | 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: 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 + SKIP_FILE="${GITHUB_WORKSPACE}/.github/build_tools/skip_tests.txt" - ctest --test-dir build --output-on-failure --exclude-from-file "${SKIP_FILE}" 2>&1 | tee ctest_output.log + ./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: | - 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 - - echo "## Test summary" >> $GITHUB_STEP_SUMMARY + # --- 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 + 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 + + # --- Makefile test summary --- + echo "" >> $GITHUB_STEP_SUMMARY + echo "## Makefile Test Summary" >> $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 + + # --- 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 - - 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 - + cat "${SKIP_FILE}" >> $GITHUB_STEP_SUMMARY echo '```' >> $GITHUB_STEP_SUMMARY - echo "
" >> $GITHUB_STEP_SUMMARY fi - - 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 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/Makefile b/Applications/Makefile index 0fa70928d..a0dedbfaa 100644 --- a/Applications/Makefile +++ b/Applications/Makefile @@ -26,8 +26,11 @@ EXAMPLES := \ fdtd \ floyd_warshall \ histogram \ - prefix_sum \ - sobel_filter + prefix_sum + +ifneq ($(wildcard /usr/include/GLFW/glfw3.h),) + EXAMPLES += sobel_filter +endif ifneq ($(GPU_RUNTIME), CUDA) EXAMPLES += \ 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..35fbcc63a 100644 --- a/Applications/sobel_filter/Makefile +++ b/Applications/sobel_filter/Makefile @@ -25,8 +25,14 @@ 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 ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc @@ -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..a1835cd0f --- /dev/null +++ b/Common/require_deps.mk @@ -0,0 +1,135 @@ +# 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 (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) + FFMPEG_LIBS := $(shell pkg-config --libs libavcodec libavformat libavutil 2>/dev/null || echo "-lavcodec -lavformat -lavutil") + else + FFMPEG_CFLAGS := + FFMPEG_LIBS := + endif + + # 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) + OPENCV_LIBS := $(shell pkg-config --libs opencv4 2>/dev/null || pkg-config --libs opencv) + else + OPENCV_CFLAGS := + OPENCV_LIBS := + endif + + # 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) + GLFW3_LIBS := $(shell pkg-config --libs glfw3 2>/dev/null) + else + GLFW3_CFLAGS := + GLFW3_LIBS := + endif + + # 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) + VULKAN_LIBS := $(shell pkg-config --libs vulkan 2>/dev/null || echo "-lvulkan") + else + VULKAN_CFLAGS := + 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) + +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/Makefile b/HIP-Basic/Makefile index 95606788e..9f83aaff1 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 ($(wildcard /usr/include/GLFW/glfw3.h),) + EXAMPLES += opengl_interop + ifneq ($(wildcard /usr/include/vulkan/vulkan.h),) + EXAMPLES += vulkan_interop + endif +endif + # Only supported on HIP (not CUDA). ifneq ($(GPU_RUNTIME), CUDA) EXAMPLES += \ 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..3128fff4d 100644 --- a/HIP-Basic/opengl_interop/Makefile +++ b/HIP-Basic/opengl_interop/Makefile @@ -25,8 +25,14 @@ 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 ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include HIPCXX ?= $(ROCM_INSTALL_DIR)/bin/hipcc @@ -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/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 e0d2b2197..f25e91acc 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..53de4637d 100644 --- a/HIP-Basic/vulkan_interop/Makefile +++ b/HIP-Basic/vulkan_interop/Makefile @@ -24,8 +24,14 @@ 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 ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) CUDA_INSTALL_DIR ?= /usr/local/cuda HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include @@ -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/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/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 000000000..175fabe96 Binary files /dev/null and b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/template_warp_size_reduction/hip_template_warp_size_reduction differ 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/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 000000000..4bfc082f9 Binary files /dev/null and b/HIP-Doc/Programming-Guide/HIP-C++-Language-Extensions/warp_size_reduction/hip_warp_size_reduction differ 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/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 000000000..4bf118fb2 Binary files /dev/null and b/HIP-Doc/Programming-Guide/Porting-CUDA-code-to-HIP/identifying_host_device_compilation_pass/hip_calling_global_functions differ 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 86c8d8249..e271571d3 100644 --- a/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile +++ b/HIP-Doc/Tutorials/Programming-Patterns/bfs/Makefile @@ -21,11 +21,12 @@ # SOFTWARE. EXAMPLE := hip_bfs +TEST_ARGS := graph4096.txt 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/bfs/graphgen b/HIP-Doc/Tutorials/Programming-Patterns/bfs/graphgen new file mode 100755 index 000000000..73a1375c7 Binary files /dev/null and b/HIP-Doc/Tutorials/Programming-Patterns/bfs/graphgen differ diff --git a/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile b/HIP-Doc/Tutorials/Programming-Patterns/histogram_atomics/Makefile index f18d30eaf..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 2501e7758..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 4b9de3379..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 184f6edf7..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 5374a7e8a..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 1b1077bdc..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 cb199d05a..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 ab9ae3dfc..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 e7e9abfc1..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 817b1a4eb..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 069228f79..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 7628119f0..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 0b13afb67..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/Makefile b/Libraries/Makefile index f8d6ae443..8133663d4 100644 --- a/Libraries/Makefile +++ b/Libraries/Makefile @@ -31,26 +31,59 @@ 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 \ rocPRIM \ rocProfiler-SDK \ rocSOLVER \ rocSPARSE \ rocThrust \ - rocWMMA \ - RPP + 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 +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 + +ifneq ($(wildcard $(INCLUDE_DIR)/rpp/rpp.h),) +LIBRARIES += RPP +endif + endif all: $(LIBRARIES) diff --git a/Libraries/RCCL/allgather/Makefile b/Libraries/RCCL/allgather/Makefile index c87929fae..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 10af8260c..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 8c84548ae..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 1f80328a7..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 b0041dff1..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 2b75db86c..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 51faf584f..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 223ec082c..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 ced19fc22..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 28459a4e7..3f17c5ea9 100644 --- a/Libraries/RPP/box_filter/Makefile +++ b/Libraries/RPP/box_filter/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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 f651586d6..9d8026910 100644 --- a/Libraries/RPP/brightness/Makefile +++ b/Libraries/RPP/brightness/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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 bab22245e..36c18a445 100644 --- a/Libraries/RPP/contrast/Makefile +++ b/Libraries/RPP/contrast/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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 a198138bf..4a07b3e5b 100644 --- a/Libraries/RPP/flip/Makefile +++ b/Libraries/RPP/flip/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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 b1f31b40e..729b63392 100644 --- a/Libraries/RPP/gamma_correction/Makefile +++ b/Libraries/RPP/gamma_correction/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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 038e59a33..5ea51b12f 100644 --- a/Libraries/RPP/resize/Makefile +++ b/Libraries/RPP/resize/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include RPP_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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/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 b680902ac..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 d20a6d115..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 75c743101..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 08e847d0b..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 414b0dad6..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 172db1c79..df01fa5ff 100644 --- a/Libraries/rocCV/bilateral_filter/Makefile +++ b/Libraries/rocCV/bilateral_filter/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 8c5fddb1f..59a1f77a4 100644 --- a/Libraries/rocCV/bnd_box/Makefile +++ b/Libraries/rocCV/bnd_box/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 4f0e411ac..61c2fb771 100644 --- a/Libraries/rocCV/center_crop/Makefile +++ b/Libraries/rocCV/center_crop/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 d740fbbc2..fb3efc01c 100644 --- a/Libraries/rocCV/composite/Makefile +++ b/Libraries/rocCV/composite/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 96b4a2aba..118d5a66b 100644 --- a/Libraries/rocCV/copy_make_border/Makefile +++ b/Libraries/rocCV/copy_make_border/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 8e319c98e..09eada2a1 100644 --- a/Libraries/rocCV/cropandresize/Makefile +++ b/Libraries/rocCV/cropandresize/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 ff36c725a..003bf5e63 100644 --- a/Libraries/rocCV/custom_crop/Makefile +++ b/Libraries/rocCV/custom_crop/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 de414254d..e8c05d4c5 100644 --- a/Libraries/rocCV/gamma_contrast/Makefile +++ b/Libraries/rocCV/gamma_contrast/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 0a0fd4d68..7e44b663c 100644 --- a/Libraries/rocCV/normalize/Makefile +++ b/Libraries/rocCV/normalize/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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 25779d31a..f14face83 100644 --- a/Libraries/rocCV/warp_perspective/Makefile +++ b/Libraries/rocCV/warp_perspective/Makefile @@ -25,8 +25,14 @@ 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 := /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCCV_INCLUDE_DIR := $(HIP_INCLUDE_DIR)/roccv @@ -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/rocdec_decode/Makefile b/Libraries/rocDecode/rocdec_decode/Makefile index efd4b8c6d..b7d82c6e9 100644 --- a/Libraries/rocDecode/rocdec_decode/Makefile +++ b/Libraries/rocDecode/rocdec_decode/Makefile @@ -25,8 +25,11 @@ 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 ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCDECODE_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -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_decode/Makefile b/Libraries/rocDecode/video_decode/Makefile index 284e8e6a8..30392d336 100644 --- a/Libraries/rocDecode/video_decode/Makefile +++ b/Libraries/rocDecode/video_decode/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -46,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 @@ -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 aced12a1c..118d62aff 100644 --- a/Libraries/rocDecode/video_decode_batch/Makefile +++ b/Libraries/rocDecode/video_decode_batch/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -39,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 @@ -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 050c48f85..0a0327893 100644 --- a/Libraries/rocDecode/video_decode_mem/Makefile +++ b/Libraries/rocDecode/video_decode_mem/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -39,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 @@ -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 bcd2da706..3439a3852 100644 --- a/Libraries/rocDecode/video_decode_multi_files/Makefile +++ b/Libraries/rocDecode/video_decode_multi_files/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -39,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 @@ -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 aa0dbf1a4..36db9e2f2 100644 --- a/Libraries/rocDecode/video_decode_perf/Makefile +++ b/Libraries/rocDecode/video_decode_perf/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -46,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 @@ -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 757238b0f..cd8b64d45 100644 --- a/Libraries/rocDecode/video_decode_pic_files/Makefile +++ b/Libraries/rocDecode/video_decode_pic_files/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -46,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 @@ -99,3 +105,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif 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..374d82d04 100644 --- a/Libraries/rocDecode/video_decode_rgb/Makefile +++ b/Libraries/rocDecode/video_decode_rgb/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -39,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 @@ -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 9d76e3817..1d59b459f 100644 --- a/Libraries/rocDecode/video_to_sequence/Makefile +++ b/Libraries/rocDecode/video_to_sequence/Makefile @@ -25,8 +25,14 @@ 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 ?= /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 @@ -39,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 -lstdc++fs ifeq ($(GPU_RUNTIME), HIP) CXXFLAGS ?= -Wall -Wextra @@ -79,3 +85,9 @@ clean: $(RM) $(EXAMPLE) .PHONY: clean + +else +all: +clean: +.PHONY: all clean +endif 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 bf914cc84..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 1e2b5eef4..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 4c1143bf0..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 b16f075de..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/Makefile b/Libraries/rocProfiler-SDK/Makefile index 75cc0bd74..58e465dda 100644 --- a/Libraries/rocProfiler-SDK/Makefile +++ b/Libraries/rocProfiler-SDK/Makefile @@ -28,9 +28,15 @@ EXAMPLES := \ counter_collection \ external_correlation_id_request \ intercept_table \ - openmp_target \ pc_sampling +ifneq ($(ENABLE_OPENMP), OFF) + _ROCM_DIR := $(or $(ROCM_PATH),/opt/rocm) + ifneq ($(wildcard $(_ROCM_DIR)/bin/amdclang++),) + EXAMPLES += openmp_target + endif +endif + all: $(EXAMPLES) clean: TARGET=clean 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..fb8cae6a2 100644 --- a/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile +++ b/Libraries/rocProfiler-SDK/code_object_isa_decode/Makefile @@ -25,8 +25,14 @@ 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 ?= /opt/rocm +ROCM_INSTALL_DIR := $(or $(ROCM_PATH),/opt/rocm) HIP_INCLUDE_DIR := $(ROCM_INSTALL_DIR)/include ROCPROFILER_INCLUDE_DIR := $(HIP_INCLUDE_DIR) @@ -60,3 +66,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 0d4a45632..6c1a7ca7e 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) @@ -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 @@ -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) 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/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/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/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. diff --git a/Tools/ROCgdb/Makefile b/Tools/ROCgdb/Makefile index 1c27483ca..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/ROCgdb/rocgdb-matmul b/Tools/ROCgdb/rocgdb-matmul new file mode 100755 index 000000000..d30202021 Binary files /dev/null and b/Tools/ROCgdb/rocgdb-matmul differ 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 diff --git a/configure.sh b/configure.sh new file mode 100755 index 000000000..6f24f6db4 --- /dev/null +++ b/configure.sh @@ -0,0 +1,210 @@ +#!/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 +} + +# 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. +# 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 + _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 +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 && can_link libavcodec libavformat libavutil; then + HAVE_FFMPEG=1 + FFMPEG_CFLAGS="$(pkg_cflags libavcodec libavformat libavutil)" + FFMPEG_LIBS="$(pkg_libs libavcodec libavformat libavutil)" +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 && can_link opencv4; then + HAVE_OPENCV=1 + OPENCV_CFLAGS="$(pkg_cflags opencv4)" + OPENCV_LIBS="$(pkg_libs opencv4)" +elif pkg_check opencv && can_link 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 && can_link 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 && can_link vulkan; then + HAVE_VULKAN=1 + VULKAN_CFLAGS="$(pkg_cflags vulkan)" + VULKAN_LIBS="$(pkg_libs vulkan)" +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 + +# --- 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 + 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..45f1f0f22 --- /dev/null +++ b/run_makefile_tests.sh @@ -0,0 +1,252 @@ +#!/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 [--allow-file=FILE] [--skip-file=FILE] [--timeout=SECONDS] +# +# 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=}" + ;; + --timeout=*) + TIMEOUT="${arg#--timeout=}" + ;; + --help|-h) + echo "Usage: $0 [--allow-file=FILE] [--skip-file=FILE] [--timeout=SECONDS]" + exit 0 + ;; + esac +done + +# 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 +} + +TESTS_LIST="/tmp/makefile_tests_list_$$.txt" + +# 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 := //') + + # Skip Makefiles without EXAMPLE (parent Makefiles) + [ -z "${example_name}" ] && continue + + # Skip if executable wasn't built + [ ! -x "${dir}/${example_name}" ] && continue + + # 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}" + +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 + +# 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), ${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 +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)) + + # 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) + 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)) + 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 + print_result "${CURRENT}" "${NUM_TESTS}" "${CURRENT}" "${example_name}" "Timeout" "${elapsed_fmt}" + else + 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) ---" + tail -20 "/tmp/test_${example_name}.log" + echo "--- end output ---" + fi +done < "${TESTS_LIST}" + +rm -f "${TESTS_LIST}" + +END_TIME=$(date +%s) +TOTAL_TIME=$((END_TIME - START_TIME)) + +echo "" +RAN=$((PASSED + FAILED)) +if [ "${FAILED}" -eq 0 ]; then + PERCENT=100 +elif [ "${RAN}" -gt 0 ]; then + PERCENT=$(( (PASSED * 100) / RAN )) +else + PERCENT=0 +fi + +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 "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