Fixed CMakeLists.txt for HIP tests (7d99be2d) · Commits · TNL / tnl-dev

src/UnitTests/Algorithms/CMakeLists.txt

+9 −13

Original line number	Diff line number	Diff line
		@@ -31,16 +31,12 @@ if( BUILD_CUDA )
		endforeach()
		endif()

		IF( BUILD_HIP )
		HIP_ADD_EXECUTABLE( MemoryOperationsTest MemoryOperationsTest.cpp )
		TARGET_COMPILE_OPTIONS( MemoryOperationsTest PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( MemoryOperationsTest ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( MultireductionTest MultireductionTest.cpp )
		TARGET_COMPILE_OPTIONS( MultireductionTest PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( MultireductionTest ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( ParallelForTest ParallelForTest.cpp )
		TARGET_COMPILE_OPTIONS( ParallelForTest PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( ParallelForTest ${GTEST_BOTH_LIBRARIES} )
		ENDIF( BUILD_HIP )
		if( BUILD_HIP )
		foreach( base IN ITEMS ${CPP_TESTS} )
		set( target ${base}Hip )
		set_source_files_properties( ${base}.cpp PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1 )
		hip_add_executable( ${target} ${base}.cpp HIPCC_OPTIONS ${CXX_TESTS_FLAGS} )
		target_link_libraries( ${target} ${GTEST_BOTH_LIBRARIES} )
		add_test( ${target} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}${CMAKE_EXECUTABLE_SUFFIX} )
		endforeach()
		endif()

src/UnitTests/Containers/CMakeLists.txt

+9 −35

Original line number	Diff line number	Diff line
		@@ -44,41 +44,15 @@ if( BUILD_CUDA )
		endforeach()
		endif()

		IF( BUILD_HIP )
		HIP_ADD_EXECUTABLE( ArrayTestHip ArrayTest.cpp )
		TARGET_COMPILE_OPTIONS( ArrayTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( ArrayTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( ArrayViewTestHip ArrayViewTest.cpp )
		TARGET_COMPILE_OPTIONS( ArrayViewTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( ArrayViewTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( VectorTestHip VectorTest.cpp )
		TARGET_COMPILE_OPTIONS( VectorTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( VectorTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( VectorPrefixSumTestHip VectorPrefixSumTest.cpp )
		TARGET_COMPILE_OPTIONS( VectorPrefixSumTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( VectorPrefixSumTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( VectorEvaluateAndReduceTestHip VectorEvaluateAndReduceTest.cpp )
		TARGET_COMPILE_OPTIONS( VectorEvaluateAndReduceTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( VectorEvaluateAndReduceTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( VectorBinaryOperationsTestHip VectorBinaryOperationsTest.cpp )
		TARGET_COMPILE_OPTIONS( VectorBinaryOperationsTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( VectorBinaryOperationsTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( VectorUnaryOperationsTestHip VectorUnaryOperationsTest.cpp )
		TARGET_COMPILE_OPTIONS( VectorUnaryOperationsTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( VectorUnaryOperationsTestHip ${GTEST_BOTH_LIBRARIES} )

		HIP_ADD_EXECUTABLE( VectorVerticalOperationsTestHip VectorVerticalOperationsTest.cpp )
		TARGET_COMPILE_OPTIONS( VectorVerticalOperationsTestHip PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( VectorVerticalOperationsTestHip ${GTEST_BOTH_LIBRARIES} )

		ADD_TEST( ArrayTestHip ${EXECUTABLE_OUTPUT_PATH}/ArrayTestHip${CMAKE_EXECUTABLE_SUFFIX} )
		ENDIF( BUILD_HIP )
		if( BUILD_HIP )
		foreach( base IN ITEMS ${CPP_TESTS} )
		set( target ${base}Hip )
		set_source_files_properties( ${base}.cpp PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1 )
		hip_add_executable( ${target} ${base}.cpp HIPCC_OPTIONS ${CXX_TESTS_FLAGS} )
		target_link_libraries( ${target} ${GTEST_BOTH_LIBRARIES} )
		add_test( ${target} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}${CMAKE_EXECUTABLE_SUFFIX} )
		endforeach()
		endif()


		if( ${BUILD_MPI} )

src/UnitTests/Pointers/CMakeLists.txt

+8 −10

Original line number	Diff line number	Diff line
		@@ -20,13 +20,11 @@ if( BUILD_CUDA )
		endif()

		if( BUILD_HIP )
		HIP_ADD_EXECUTABLE( SharedPointerHipTest SharedPointerHipTest.cpp )
		TARGET_COMPILE_OPTIONS( SharedPointerHipTest PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( SharedPointerHipTest ${GTEST_BOTH_LIBRARIES} )
		ADD_TEST( SharedPointerHipTest ${EXECUTABLE_OUTPUT_PATH}/SharedPointerHipTest${CMAKE_EXECUTABLE_SUFFIX} )

		HIP_ADD_EXECUTABLE( DevicePointerHipTest DevicePointerHipTest.cpp )
		TARGET_COMPILE_OPTIONS( DevicePointerHipTest PRIVATE ${CMAKE_HIPCXX_FLAGS} ${CXX_TESTS_FLAGS} )
		TARGET_LINK_LIBRARIES( DevicePointerHipTest ${GTEST_BOTH_LIBRARIES} )
		ADD_TEST( DevicePointerHipTest ${EXECUTABLE_OUTPUT_PATH}/DevicePointerHipTest${CMAKE_EXECUTABLE_SUFFIX} )
		endif( BUILD_HIP )
		foreach( base IN ITEMS ${CPP_TESTS} )
		set( target ${base}Hip )
		set_source_files_properties( ${base}.cpp PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1 )
		hip_add_executable( ${target} ${base}.cpp HIPCC_OPTIONS ${CXX_TESTS_FLAGS} )
		target_link_libraries( ${target} ${GTEST_BOTH_LIBRARIES} )
		add_test( ${target} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}${CMAKE_EXECUTABLE_SUFFIX} )
		endforeach()
		endif()