From 6dc853cb267c4b9dcad658a4cd6b6cf10615f65a Mon Sep 17 00:00:00 2001 From: Payam Ghafari Date: Tue, 18 May 2021 10:31:25 -0400 Subject: [PATCH] Revert "SWDEV-197835 - adding Khronos OpenCL ICD build" This reverts commit d09b6e30fc6cda88c277419ff1760be9bb1abb44. Reason for revert: need to update other projects (linuxpro & marnier) Change-Id: Ib02194d052170e487cd56480eb0d9226895aa580 [ROCm/clr commit: 0762c948b66fb75a34c3708fd98853512ac9dabb] --- projects/clr/opencl/CMakeLists.txt | 48 ++++--------------- projects/clr/opencl/packaging/rocm-opencl.txt | 6 +-- .../tests/ocltst/module/common/CMakeLists.txt | 2 +- .../clr/opencl/tools/clinfo/CMakeLists.txt | 2 +- 4 files changed, 13 insertions(+), 45 deletions(-) diff --git a/projects/clr/opencl/CMakeLists.txt b/projects/clr/opencl/CMakeLists.txt index 31f0dd65ca..76847d37a7 100644 --- a/projects/clr/opencl/CMakeLists.txt +++ b/projects/clr/opencl/CMakeLists.txt @@ -1,28 +1,8 @@ -# Copyright (C) 2017-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. - cmake_minimum_required(VERSION 3.5.1) if (POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) - set(PROJ_VERSION VERSION 1.5.0) + cmake_policy(SET CMP0048 NEW) + set(PROJ_VERSION VERSION 1.5.0) endif() project(opencl) @@ -34,17 +14,7 @@ set(CMAKE_CXX_EXTENSIONS OFF) #example command: # cmake -DCMAKE_PREFIX_PATH=/path/to/ROCclr/build/or/install .. -if(NOT DEFINED OPENCL_ICD_DIR) - set(OPENCL_ICD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../OpenCL-ICD-Loader") -endif() - -if(NOT DEFINED OPENCL_ICD_HEADERS) - set(OPENCL_ICD_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/../OpenCL-Headers") -endif() - -set(OPENCL_ICD_LOADER_HEADERS_DIR "${OPENCL_ICD_HEADERS}" CACHE PATH "") - -set(OPENCL_ICD_LOADER_HEADERS_DIR_INTERNAL "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "") +set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/khronos/headers/opencl2.2" CACHE PATH "") option(BUILD_SHARED_LIBS "Build shared libs" ON) #set a name for icd file @@ -95,9 +65,12 @@ if(USE_COMGR_LIBRARY) endif() -find_package(ROCclr REQUIRED CONFIG PATHS ${ROCclr_DIR} ${LIBROCclr_STATIC_DIR}) +find_package(ROCclr REQUIRED CONFIG + PATHS + ${ROCclr_DIR} + ${LIBROCclr_STATIC_DIR}) -add_subdirectory(${OPENCL_ICD_DIR} ${OPENCL_ICD_DIR}/build) +add_subdirectory(khronos/icd) add_subdirectory(amdocl) add_subdirectory(tools/clinfo) add_subdirectory(tools/cltrace) @@ -164,11 +137,6 @@ install(PROGRAMS $ DESTINATION lib COMPONENT DEV) -add_custom_target(opencl ALL COMMAND echo "copying opencl lib from ${OPENCL_ICD_DIR}/build" - COMMAND cp ${OPENCL_ICD_DIR}/build/*.so* ${CMAKE_CURRENT_BINARY_DIR}/lib - WORKING_DIRECTORY ${BUILD_DIR} - DEPENDS amdocl64 OpenCL) - ############################# # Packaging steps ############################# diff --git a/projects/clr/opencl/packaging/rocm-opencl.txt b/projects/clr/opencl/packaging/rocm-opencl.txt index cd88c14e47..6a84ae01a7 100644 --- a/projects/clr/opencl/packaging/rocm-opencl.txt +++ b/projects/clr/opencl/packaging/rocm-opencl.txt @@ -3,9 +3,9 @@ project(rocm-opencl) install(DIRECTORY @PROJECT_BINARY_DIR@/bin DESTINATION . USE_SOURCE_PERMISSIONS) install(FILES @PROJECT_BINARY_DIR@/lib/libamdocl64.so DESTINATION lib) -install(FILES @PROJECT_BINARY_DIR@/lib/libOpenCL.so DESTINATION lib) -install(FILES @PROJECT_BINARY_DIR@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@ DESTINATION lib) -install(FILES @PROJECT_BINARY_DIR@/lib/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@ DESTINATION lib) +install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so DESTINATION lib) +install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so.@OPENCL_LIB_VERSION_MAJOR@ DESTINATION lib) +install(FILES @PROJECT_BINARY_DIR@/khronos/icd/libOpenCL.so.@OPENCL_LIB_VERSION_STRING@ DESTINATION lib) ############################# # Packaging steps diff --git a/projects/clr/opencl/tests/ocltst/module/common/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/common/CMakeLists.txt index b959826d14..a4447c6a52 100644 --- a/projects/clr/opencl/tests/ocltst/module/common/CMakeLists.txt +++ b/projects/clr/opencl/tests/ocltst/module/common/CMakeLists.txt @@ -35,7 +35,7 @@ endif() target_include_directories(Common PUBLIC - ${OPENCL_ICD_LOADER_HEADERS_DIR_INTERNAL} + ${OPENCL_ICD_LOADER_HEADERS_DIR} ${OCLTST_DIR}/include ${OCLTST_DIR}/module/common ${OCLTST_DIR}/module/include diff --git a/projects/clr/opencl/tools/clinfo/CMakeLists.txt b/projects/clr/opencl/tools/clinfo/CMakeLists.txt index 87ccaf1c13..ebc1faf084 100644 --- a/projects/clr/opencl/tools/clinfo/CMakeLists.txt +++ b/projects/clr/opencl/tools/clinfo/CMakeLists.txt @@ -1,7 +1,7 @@ set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) -include_directories(${OPENCL_ICD_LOADER_HEADERS_DIR_INTERNAL}) +include_directories(${OPENCL_ICD_LOADER_HEADERS_DIR}) add_definitions(-DHAVE_CL2_HPP -DCL_TARGET_OPENCL_VERSION=220)