SWDEV-385161 - Deprecate usage of env vars in HIP samples and tests (#363)

* SWDEV-385161 - Deprecate usage of env vars in HIP samples and tests env vars such as HIP_PATH, ROCM_PATH, HIP_COMPILER, HIP_RUNTIME, HSA_PATH etc are removed.

Change-Id: I280e20b291cfb14675846aae72d97fa5b3ad567d

samples/0_Intro/square/CMakeLists.txt

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 - 2021 Advanced Micro Devices, Inc. All Rights Reserved.
+# Copyright (c) 2020 - 2023 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
@@ -24,15 +24,8 @@ project(square)
 
 cmake_minimum_required(VERSION 3.10)
 
-if (NOT DEFINED ROCM_PATH )
-     set ( ROCM_PATH "/opt/rocm"  CACHE STRING "Default ROCM installation directory." )
-endif ()
-
-# Search for rocm in common locations
-list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH})
-
 # create square.cpp
-execute_process(COMMAND sh -c "${ROCM_PATH}/hip/bin/hipify-perl ../square.cu > ../square.cpp")
+execute_process(COMMAND sh -c "${CMAKE_PREFIX_PATH}/hip/bin/hipify-perl ../square.cu > ../square.cpp")
 
 # Find hip
 find_package(hip)
@@ -45,4 +38,4 @@ set(CMAKE_CXX_LINKER   ${HIP_HIPCC_EXECUTABLE})
 add_executable(square square.cpp)
 
 # Link with HIP
-target_link_libraries(square hip::host)
+target_link_libraries(square hip::host)

samples/0_Intro/square/Makefile

@@ -1,47 +0,0 @@
-# Copyright (c) 2016 - 2021 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.
-ifeq ($(OS),Windows_NT)
- $(error Makefile is not supported on windows platform. Please use cmake instead to build sample.)
-endif
-ROCM_PATH?= $(wildcard /opt/rocm/)
-HIP_PATH?= $(wildcard $(ROCM_PATH)/hip)
-ifeq (,$(HIP_PATH))
-	HIP_PATH=../../..
-endif
-HIP_PLATFORM=$(shell $(HIP_PATH)/bin/hipconfig --platform)
-HIPCC=$(HIP_PATH)/bin/hipcc
-
-ifeq (${HIP_PLATFORM}, nvidia)
-	SOURCES=square.cu
-else
-	SOURCES=square.cpp
-endif
-
-all: square.out
-
-# Step
-square.cpp: square.cu
-	$(HIP_PATH)/bin/hipify-perl square.cu > square.cpp
-
-square.out: $(SOURCES)
-	$(HIPCC) $(CXXFLAGS) $(SOURCES) -o $@
-
-clean:
-	rm -f *.o *.out square.cpp

samples/0_Intro/square/README.md

@@ -14,11 +14,16 @@ $ export PATH=$PATH:[MYHIP]/bin
 $ export HIP_PATH=[MYHIP]
 ```
 
-- Build executible file
+- Build executable file
 
 ```
 $ cd ~/hip/samples/0_Intro/square
-$ make
+  mkdir -p build && cd build
+
+  cmake -DCMAKE_PREFIX_PATH=<path/to/rocm> -DHIP_CXX_COMPILER=<path/to/clang> ..
+  make
+
+$ Building without cmake
 /opt/rocm/hip/bin/hipify-perl square.cu > square.cpp
 /opt/rocm/hip/bin/hipcc  square.cpp -o square.out
 /opt/rocm/hip/bin/hipcc -use-staticlib  square.cpp -o square.out.static