regression: do not use file system symbolic/hard links (ROCm#2425)

Co-authored-by: Artur Wojcik <artur.wojcik@amd.com> Co-authored-by: JD <jahandad@gmail.com> Co-authored-by: Jun Liu <Liu.Jun@amd.com>
atamazov · Oct 18, 2023 · 31e8376 · 31e8376
1 parent ac2036d
commit 31e8376
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 12 deletions.
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
@@ -28,6 +28,7 @@ cmake_minimum_required( VERSION 3.5)
 find_package(Threads REQUIRED)
 
 add_executable(MIOpenDriver main.cpp InputFlags.cpp)
+target_include_directories(MIOpenDriver PRIVATE ../src/kernels)
 target_link_libraries(MIOpenDriver MIOpen)
 target_link_libraries(MIOpenDriver ${CMAKE_THREAD_LIBS_INIT})
 if(NOT MIOPEN_EMBED_DB STREQUAL "")

diff --git a/driver/driver.hpp b/driver/driver.hpp
@@ -44,7 +44,7 @@
 #include <miopen/bfloat16.hpp>
 using half         = half_float::half;
 using hip_bfloat16 = bfloat16;
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 using float16 = half_float::half;
 using float8  = miopen_f8::hip_f8<miopen_f8::hip_f8_type::fp8>;
 using bfloat8 = miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8>;

diff --git a/speedtests/CMakeLists.txt b/speedtests/CMakeLists.txt
@@ -16,7 +16,7 @@ function(add_speedtest_executable TEST_NAME)
     endif()
     separate_arguments(MIOPEN_TEST_FLAGS_ARGS UNIX_COMMAND ${MIOPEN_TEST_FLAGS})
     target_link_libraries(${TEST_NAME} MIOpen)
-    target_include_directories(${TEST_NAME} PRIVATE ../test)
+    target_include_directories(${TEST_NAME} PRIVATE ../test ../src/kernels)
 endfunction(add_speedtest_executable)
 
 foreach(TEST ${TESTS})

diff --git a/src/include/miopen/hip_f8_impl.hpp b/src/include/miopen/hip_f8_impl.hpp
diff --git a/src/include/miopen/hip_float8.hpp b/src/include/miopen/hip_float8.hpp
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -372,9 +372,10 @@ function(add_test_executable TEST_NAME)
     endif()
     if(NOT MIOPEN_EMBED_DB STREQUAL "")
         target_link_libraries(${TEST_NAME} MIOpen miopen_data)
-    else()
+    else()       
         target_link_libraries(${TEST_NAME} MIOpen)
     endif()
+    target_include_directories(${TEST_NAME} PRIVATE ../src/kernels)
 endfunction(add_test_executable)
 
 set(MIOPEN_TEST_SANITIZERS)

diff --git a/test/cpu_conv.hpp b/test/cpu_conv.hpp
@@ -39,7 +39,7 @@
 #include "tensor_holder.hpp"
 #include <miopen/stringutils.hpp>
 #include <miopen/functional.hpp>
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 
 template <class T, class... Ts>
 static constexpr auto make_array(T x, Ts... xs)

diff --git a/test/gtest/CMakeLists.txt b/test/gtest/CMakeLists.txt
@@ -24,7 +24,7 @@ function(add_gtest TEST_NAME)
     add_dependencies(tests test_${TEST_NAME})
     add_dependencies(check test_${TEST_NAME})
     target_compile_options(test_${TEST_NAME} PRIVATE -Wno-global-constructors -Wno-undef)
-    target_include_directories(test_${TEST_NAME} PRIVATE ../)
+    target_include_directories(test_${TEST_NAME} PRIVATE ../ ../../src/kernels)
     if(MIOPEN_ENABLE_AI_KERNEL_TUNING)
       target_include_directories(test_${TEST_NAME} SYSTEM PRIVATE $<BUILD_INTERFACE:${FDEEP_INCLUDE_DIR}>)
       target_include_directories(test_${TEST_NAME} SYSTEM PRIVATE $<BUILD_INTERFACE:${EIGEN_INCLUDE_DIR}/eigen3>)

diff --git a/test/gtest/solver_bwd.hpp b/test/gtest/solver_bwd.hpp
@@ -32,7 +32,7 @@
 #include <fusionHost.hpp>
 #include <miopen/conv/data_invoke_params.hpp>
 
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 #include <miopen/type_name.hpp>
 #include <miopen/rank.hpp>
 

diff --git a/test/gtest/solver_fwd.hpp b/test/gtest/solver_fwd.hpp
@@ -32,7 +32,7 @@
 #include <fusionHost.hpp>
 #include <miopen/conv/data_invoke_params.hpp>
 
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 #include <miopen/type_name.hpp>
 #include <miopen/rank.hpp>
 

diff --git a/test/gtest/solver_wrw.hpp b/test/gtest/solver_wrw.hpp
@@ -32,7 +32,7 @@
 #include <fusionHost.hpp>
 #include <miopen/conv/wrw_invoke_params.hpp>
 
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 #include <miopen/type_name.hpp>
 #include <miopen/rank.hpp>
 

diff --git a/test/tensor_holder.hpp b/test/tensor_holder.hpp
@@ -44,7 +44,7 @@
 #endif
 using half         = half_float::half;
 using hip_bfloat16 = bfloat16;
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 using float8  = miopen_f8::hip_f8<miopen_f8::hip_f8_type::fp8>;
 using bfloat8 = miopen_f8::hip_f8<miopen_f8::hip_f8_type::bf8>;
 

diff --git a/test/verify.hpp b/test/verify.hpp
@@ -36,7 +36,7 @@
 #include <miopen/bfloat16.hpp>
 using half         = half_float::half;
 using hip_bfloat16 = bfloat16;
-#include <miopen/hip_float8.hpp>
+#include <hip_float8.hpp>
 #include "tensor_holder.hpp"
 
 namespace miopen {