Skip to content

Commit

Permalink
rocAL - CMake and header files Clean up (#991)
Browse files Browse the repository at this point in the history 
* rocAL - removing references (#954)

* rocAL - Tf pets training  (#947)

* Zen DNN - Docker & Tests (#924)

* Zen DNN - Docker Updates

* Zen DNN - Sample Updates

* Codacy - Fix

* Zen DNN - Cleanup

* Zen DNN - single layer sample

* Rocal Updates (#921)

* rocal updates for tf training

* updates for rocal

* tf updates and pytorch bug fixes

* repo name change

* Update README.md

* dockerfile update

* [rocAL] Fix rocAL Pybind build issue.

* [rocAL] Remove unused function in pipeline.

* [rocAL] Change rocAL pybind installation from setup.py to wheel.
setup.py install is deprecated in python 3.9

* [rocAL] Make TF pets example dataset compatible with tf2.

* [rocAL] Change getImageLabels() compatible with tf.

* [rocAL] Add fix to pick wheel from dist installation folder.
Remove the old installation files in conda environment.

* [rocAL] Remove commented statement.

Co-authored-by: shobana-mcw <shobana@multicorewareinc.com>

* Docker Update (#928)

* turboJPEG version update

* turboJPEG version update

* turboJPEG version update

* TurboJPEG version update

* Update mivisionx-opencl-on-ubuntu20.dockerfile

* Update zenDNN-HIP.dockerfile

* Update level-5.dockerfile

* Update level-5.dockerfile

* Zen DNN Updates Sync

Co-authored-by: Kiriti Gowda <kiriti.nageshgowda@amd.com>

* AMD OpenVX Custom Extension - implementation (#925)

* custom node implementation files

* fix build errors

* custom extension changes for working implementation

* add README and documentation

* update readme

* fix codacy issues and CPU flow

* fix cadacy warning

* Addressed review comments

* minor change

* fix formating

* amd_migraphx - update readme for extension (#929)

* amd_custom - fixes build issue (#935)

* fixes build issue

* Update CMakeLists.txt

* tf_pets_v2

* code_cleanup

* minor code cleanup

* migraphx extension - update the readme(#936)

* vx_amd_migraphx - tests (#923)

* batch size support for migraphx

* changing to accept tensors of all batch sizes

* creates file with results

* bug fix

* changes to singular test cases - mnist and resnet50

* readme updates

* resolving PR comments

* resolving PR comments

* resolving PR comments

* Readme update to reflect tot

* formatting

* fixing typo

* readme update

* readme update

* OpenVX HIP backend - report correct number of CUs for gfx10+ in the logs (#930)

* PyTorch docker file - add argument for specifying version (#938)

* add argument for specifying pytorch version for building docker file

* add readme for pytorch

* rocAL - Fix ROCAL_USE_USER_GIVEN_SIZE_RESTRICTED (#940)

* Docker - codacy fix for pr937 (#942)

* rocAL - Adding NCHW FP16 SIMD kernel (#926)

* Adding NCHW FP16 SIMD kernel for normalization and buffer copy

* Fixed some codestyle issues with FP16 kernel

* Using FMA SSE instruction for multiply-add ops

* Removed extra spaces

* Adding fma flag to rocAL CMakeLists

* Adding FP16 intrinsics for buffer copies

* Setting rounding mode to _MM_FROUND_TO_ZERO

* rocAL  - README updates for video unit test (#939)

* Add README support for video unit test

* Update Readme for video unit test

* Minor test_suite fix

* Update video unit test Readme

* Update Readme

* Updated README with the explation of test cases and arguments

* Minor fix

* Add test case samples to video unit test README

Also add images for README

* Modify sample images

* Change sample image dimension

* Minor README changes

* Minor README changes

* Minor change

* Minor fix to handle relative input path in video unit test

* Resolve codacy warnings

* Minor change

* Add correct video reader outputs

* MIVisionX - cmake cleanup (#943)

* OpenCV EXT - Updates & Tests (#944)

* OpenCV - Readme updates

* Updates - Readme & Tests

* OpenCV - Tests Added

* Updates

* ZenDNN - model compiler (#941)

* model compiler - zendnn - mnist layers

* bug fix + lrn

* layers: batch norm, sum ; bug fixes

* fixes lgtm errors

* bug fixes

* codacy fixes

* bug fix

* codacy fixes

* Update train_withROCAL_withTFRecordReader.py

* Resolved PR comments

Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>
Co-authored-by: LakshmiKumar23 <lakshmi.kumar@amd.com>
Co-authored-by: shobana-mcw <shobana@multicorewareinc.com>
Co-authored-by: Kiriti Gowda <kiriti.nageshgowda@amd.com>
Co-authored-by: Rajy Rawther <Rajy.MeeyakhanRawther@amd.com>
Co-authored-by: Aryan Salmanpour <aryan.salmanpour@amd.com>
Co-authored-by: root <root@jenkins-worker-rocm-amd-104.local.lan>
Co-authored-by: Sundar Rajan Vaithiyanathan <99159823+SundarRajan28@users.noreply.github.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>

* rocAL - fix bug in the usage of GetImageName (#955)

* fix bug in the usage of GetImageName

* add ground-truth labels .txt file for tinydataset

* rename file to all smaller case

* AMD - OpenVX Float16 Support (#956)

* AMD - Float16 Support

* Remove redundant def

* OpenVX FP16 - CPP FP16 support

* migraphx  - palamida scan fix (#984)

* Delete image_0.jpg

* Delete image_1.jpg

* Delete image_4.jpg

* image update

* Readme updates - OpenVX Trademark Updates (#989)

* Readme updates - OpenVX Trademark Updates

* Readme - Attribution Updates

* Readme - Codacy Fix

* Media - License Issue Fix (#990)

* Fix include path issue in image augmentation app.[rocAL]

* CMake clean up. [rocAL]

* Clean up. Introduce header files to include all nodes and meta nodes headers. [rocAL]

* Change include directories path in image_augmentation app.

* CMake clean up in rocAL utilities.

* Clean up.

Co-authored-by: LakshmiKumar23 <lakshmi.kumar@amd.com>
Co-authored-by: swetha097 <59434434+swetha097@users.noreply.github.com>
Co-authored-by: Kiriti Gowda <kiritigowda@gmail.com>
Co-authored-by: Kiriti Gowda <kiriti.nageshgowda@amd.com>
Co-authored-by: Rajy Rawther <Rajy.MeeyakhanRawther@amd.com>
Co-authored-by: Aryan Salmanpour <aryan.salmanpour@amd.com>
Co-authored-by: root <root@jenkins-worker-rocm-amd-104.local.lan>
Co-authored-by: Sundar Rajan Vaithiyanathan <99159823+SundarRajan28@users.noreply.github.com>
Co-authored-by: Fiona-MCW <70996026+fiona-gladwin@users.noreply.github.com>
  • Loading branch information
@shobana-mcw @LakshmiKumar23
@swetha097 @kiritigowda @rrawther @AryanSalmanpour @SundarRajan28 @fiona-gladwin
10 people committed Dec 1, 2022
1 parent 9d6e944 commit c490342
Show file tree
Hide file tree
Showing 14 changed files with 201 additions and 71 deletions.
11 changes: 1 addition & 10 deletions rocAL/rocAL/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
cmake_minimum_required(VERSION 3.0)
project(rocal)

set(MIN_CMAKE_VER_REQUIRED 3.10)
set(MIN_CXX_VER_REQUIRED 7.4)
set(CMAKE_CXX_STANDARD 14)
set(BUILD_ROCAL true)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../amd_openvx/cmake)
Expand Down Expand Up @@ -108,14 +107,6 @@ if(GPU_SUPPORT)
set(BUILD_ROCAL false)
message("-- ${Yellow}NOTE: rocAL library requires Protobuf, Not Found ${ColourReset}")
endif()
if(CMAKE_VERSION VERSION_LESS ${MIN_CMAKE_VER_REQUIRED})
set(BUILD_ROCAL false)
message("-- ${Yellow}NOTE: rocAL library requires cmake version greater than or equal to ${MIN_CMAKE_VER_REQUIRED}, currently ${CMAKE_VERSION} is installed${ColourReset}")
endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${MIN_CXX_VER_REQUIRED})
set(BUILD_ROCAL false)
message("-- ${Yellow}NOTE: rocAL library requires g++ version greater than or equal to ${MIN_CXX_VER_REQUIRED}, currently ${CMAKE_CXX_COMPILER_VERSION} is installed${ColourReset}")
endif()
endif()

if(${BUILD_ROCAL})
Expand Down
56 changes: 56 additions & 0 deletions rocAL/rocAL/include/augmentations/augmentations_nodes.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/*
Copyright (c) 2019 - 2022 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.
*/

#pragma once

#include "node_warp_affine.h"
#include "node_exposure.h"
#include "node_vignette.h"
#include "node_jitter.h"
#include "node_snp_noise.h"
#include "node_snow.h"
#include "node_rain.h"
#include "node_color_temperature.h"
#include "node_fog.h"
#include "node_pixelate.h"
#include "node_lens_correction.h"
#include "node_gamma.h"
#include "node_flip.h"
#include "node_crop_resize.h"
#include "node_brightness.h"
#include "node_contrast.h"
#include "node_blur.h"
#include "node_fisheye.h"
#include "node_blend.h"
#include "node_resize.h"
#include "node_rotate.h"
#include "node_color_twist.h"
#include "node_hue.h"
#include "node_saturation.h"
#include "node_crop_mirror_normalize.h"
#include "node_resize_crop_mirror.h"
#include "node_ssd_random_crop.h"
#include "node_crop.h"
#include "node_random_crop.h"
#include "node_copy.h"
#include "node_nop.h"
#include "node_sequence_rearrange.h"
32 changes: 32 additions & 0 deletions rocAL/rocAL/include/meta_data/augmentations_meta_nodes.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
/*
Copyright (c) 2019 - 2022 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.
*/

#pragma once

#include "meta_node_crop_mirror_normalize.h"
#include "meta_node_resize.h"
#include "meta_node_crop_resize.h"
#include "meta_node_crop.h"
#include "meta_node_resize_crop_mirror.h"
#include "meta_node_rotate.h"
#include "meta_node_ssd_random_crop.h"
#include "meta_node_flip.h"
43 changes: 2 additions & 41 deletions rocAL/rocAL/source/api/rocal_api_augmentation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,47 +22,8 @@ THE SOFTWARE.



#include "node_warp_affine.h"
#include "node_exposure.h"
#include "node_vignette.h"
#include "node_jitter.h"
#include "node_snp_noise.h"
#include "node_snow.h"
#include "node_rain.h"
#include "node_color_temperature.h"
#include "node_fog.h"
#include "node_pixelate.h"
#include "node_lens_correction.h"
#include "node_gamma.h"
#include "node_flip.h"
#include "node_crop_resize.h"
#include "node_brightness.h"
#include "node_contrast.h"
#include "node_blur.h"
#include "node_fisheye.h"
#include "node_blend.h"
#include "node_resize.h"
#include "node_rotate.h"
#include "node_color_twist.h"
#include "node_hue.h"
#include "node_saturation.h"
#include "node_crop_mirror_normalize.h"
#include "node_resize_crop_mirror.h"
#include "node_ssd_random_crop.h"
#include "node_crop.h"
#include "node_random_crop.h"
#include "node_copy.h"
#include "node_nop.h"
#include "meta_node_crop_mirror_normalize.h"
#include "meta_node_resize.h"
#include "meta_node_crop_resize.h"
#include "meta_node_crop.h"
#include "meta_node_resize_crop_mirror.h"
#include "meta_node_rotate.h"
#include "meta_node_ssd_random_crop.h"
#include "meta_node_flip.h"
#include "node_sequence_rearrange.h"

#include "augmentations_nodes.h"
#include "augmentations_meta_nodes.h"
#include "commons.h"
#include "context.h"
#include "rocal_api.h"
Expand Down
1 change: 0 additions & 1 deletion rocAL/rocAL/source/api/rocal_api_data_loaders.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ THE SOFTWARE.
#include "node_image_loader_single_shard.h"
#include "node_cifar10_loader.h"
#include "image_source_evaluator.h"
#include "node_fisheye.h"
#include "node_copy.h"
#include "node_fused_jpeg_crop.h"
#include "node_fused_jpeg_crop_single_shard.h"
Expand Down
11 changes: 1 addition & 10 deletions rocAL/rocAL_pybind/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ project(rocal_pybind)
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../../amd_openvx/cmake)
set(ROCM_PATH /opt/rocm CACHE PATH "Deafult ROCm Installation Path")

set(MIN_CMAKE_VER_REQUIRED 3.10)
set(MIN_CXX_VER_REQUIRED 7.4)
set(CMAKE_CXX_STANDARD 14)
set(BUILD_ROCAL_PYBIND true)

if(GPU_SUPPORT)
Expand Down Expand Up @@ -92,14 +91,6 @@ if(NOT TurboJpeg_FOUND)
set(BUILD_ROCAL_PYBIND false)
message("-- ${Yellow}NOTE: rocAL pybind requires TurboJpeg, Not Found${ColourReset}")
endif()
if(CMAKE_VERSION VERSION_LESS ${MIN_CMAKE_VER_REQUIRED})
set(BUILD_ROCAL_PYBIND false)
message("-- ${Yellow}NOTE: rocAL pybind required CMake Version Not Found${ColourReset}")
endif()
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS ${MIN_CXX_VER_REQUIRED})
set(BUILD_ROCAL_PYBIND false)
message("-- ${Yellow}NOTE: rocAL pybind required C++ Version Not Found${ColourReset}")
endif()

if(${BUILD_ROCAL_PYBIND})

Expand Down
14 changes: 13 additions & 1 deletion utilities/rocAL/rocAL_basic_test/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,26 @@ cmake_minimum_required(VERSION 3.0)
project(rocal_basic_test)

set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
find_package(AMDRPP QUIET)

include_directories(${ROCM_PATH}/include/mivisionx/rocal)
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories(${ROCM_PATH}/lib/)
file(GLOB My_Source_Files ./*.cpp)
add_executable(${PROJECT_NAME} ${My_Source_Files})
Expand Down
14 changes: 13 additions & 1 deletion utilities/rocAL/rocAL_dataloader/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,26 @@ cmake_minimum_required (VERSION 3.0)
project(rocal_dataloader)

set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
find_package(AMDRPP QUIET)

include_directories(${ROCM_PATH}/include/mivisionx/rocal)
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories(${ROCM_PATH}/lib/)
file(GLOB My_Source_Files ./*.cpp)
add_executable(${PROJECT_NAME} ${My_Source_Files})
Expand Down
15 changes: 14 additions & 1 deletion utilities/rocAL/rocAL_dataloader_mt/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,20 @@ cmake_minimum_required (VERSION 3.0)
project (rocAL_dataloader_mt)

set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
Expand Down Expand Up @@ -66,7 +79,7 @@ else()
endif()


include_directories (${ROCM_PATH}/include/mivisionx/rocal)
include_directories (${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories (${ROCM_PATH}/lib/)

add_executable(${PROJECT_NAME} ./rocAL_dataloader_mt.cpp)
Expand Down
16 changes: 15 additions & 1 deletion utilities/rocAL/rocAL_dataloader_tf/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,27 @@ cmake_minimum_required(VERSION 3.0)

project(rocAL_dataloader_tf)

set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
find_package(AMDRPP QUIET)

include_directories(${ROCM_PATH}/include/mivisionx/rocal)
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories(${ROCM_PATH}/lib/)
file(GLOB My_Source_Files ./*.cpp)
add_executable(${PROJECT_NAME} ${My_Source_Files})
Expand Down
15 changes: 14 additions & 1 deletion utilities/rocAL/rocAL_performance_tests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,28 @@
cmake_minimum_required(VERSION 3.0)

project (rocAL_performance_tests)

set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
find_package(AMDRPP QUIET)

include_directories(${ROCM_PATH}/include/mivisionx/rocal)
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories(${ROCM_PATH}/lib/)
file(GLOB My_Source_Files ./*.cpp)
add_executable(${PROJECT_NAME} ${My_Source_Files})
Expand Down
14 changes: 13 additions & 1 deletion utilities/rocAL/rocAL_performance_tests_with_depth/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,26 @@ cmake_minimum_required (VERSION 3.0)
project (rocAL_performance_tests_with_depth)

set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
find_package(AMDRPP QUIET)

include_directories(${ROCM_PATH}/include/mivisionx/rocal)
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories(${ROCM_PATH}/lib/)
file(GLOB My_Source_Files ./*.cpp)
add_executable(${PROJECT_NAME} ${My_Source_Files})
Expand Down
15 changes: 13 additions & 2 deletions utilities/rocAL/rocAL_unittests/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,25 @@ cmake_minimum_required(VERSION 3.0)

project (rocAL_unittests)
set(CMAKE_CXX_STANDARD 14)

# ROCm Path
set(ROCM_PATH /opt/rocm CACHE PATH "Default ROCm installation path")

# avoid setting the default installation path to /usr/local
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX ${ROCM_PATH} CACHE PATH "MIVisionX default installation path" FORCE)
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

# Add Default libdir
set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory")
include(GNUInstallDirs)

list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../amd_openvx/cmake)

find_package(OpenCV QUIET)
find_package(AMDRPP QUIET)

include_directories(${ROCM_PATH}/include/mivisionx/rocal)
include_directories(${ROCM_PATH}/${CMAKE_INSTALL_INCLUDEDIR}/mivisionx/rocal)
link_directories(${ROCM_PATH}/lib/)
file(GLOB My_Source_Files ./*.cpp)
add_executable(${PROJECT_NAME} ${My_Source_Files})
Expand Down
Loading

0 comments on commit c490342

Please sign in to comment.