regression: do not use file system symbolic links

ROCm · Oct 1, 2023 · 6678e47 · 6678e47
1 parent 8cb1a62
commit 6678e47
Show file tree

Hide file tree

Showing 10 changed files with 9 additions and 9 deletions.
diff --git a/driver/CMakeLists.txt b/driver/CMakeLists.txt
@@ -26,6 +26,7 @@
 
 add_executable(MIOpenDriver main.cpp InputFlags.cpp)
 target_link_libraries(MIOpenDriver MIOpen MIOpenCore ${BZIP2_LIBRARIES} Threads::Threads)
+target_include_directories(MIOpenDriver PRIVATE ${CMAKE_SOURCE_DIR}/src/kernels)
 if(NOT MIOPEN_EMBED_DB STREQUAL "")
 target_link_libraries(MIOpenDriver $<BUILD_INTERFACE:miopen_data> )
 endif()

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/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
@@ -368,7 +368,8 @@ function(add_test_executable TEST_NAME)
     target_include_directories(${TEST_NAME} SYSTEM PRIVATE ${BZIP2_INCLUDE_DIR})
     target_include_directories(${TEST_NAME} PRIVATE
             $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
-            $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>)
+            $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/include>
+            $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src/kernels>)
     target_include_directories(${TEST_NAME} SYSTEM PRIVATE $<BUILD_INTERFACE:${HALF_INCLUDE_DIR}>)
     if(MIOPEN_BACKEND STREQUAL "HIPOC" OR MIOPEN_BACKEND STREQUAL "HIP")
         target_link_libraries(${TEST_NAME} hip::device hip::host)

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
@@ -17,7 +17,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 ../ ${CMAKE_SOURCE_DIR}/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_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/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 {