Merge branch 'Spock' of github.com:JamesEMcClure/LBPM-WIA into Spock

2021-08-02 13:55:14 -04:00
parent 50569aed48 a55a030c3c
commit d5ab9c0a70
21 changed files with 32 additions and 52 deletions
--- a/hip/BGK.hip
+++ b/hip/BGK.hip
--- a/hip/CMakeLists.txt
+++ b/hip/CMakeLists.txt
@@ -1,10 +0,0 @@
-SET( HIP_SEPERABLE_COMPILATION ON )
-FILE( GLOB HIP_SOURCES "*.cu" )
-SET_SOURCE_FILES_PROPERTIES( ${HIP_SOURCES} PROPERTIES HIP_SOURCE_PROPERTY_FORMAT 1 )
-HIP_ADD_LIBRARY( lbpm-hip ${HIP_SOURCES} SHARED HIPCC_OPTIONS ${HIP_HIPCC_OPTIONS} HCC_OPTIONS ${HIP_HCC_OPTIONS} NVCC_OPTIONS ${HIP_NVCC_OPTIONS} ${HIP_NVCC_FLAGS} )
-#TARGET_LINK_LIBRARIES( lbpm-hip /opt/rocm-3.3.0/lib/libhip_hcc.so )
-#TARGET_LINK_LIBRARIES( lbpm-wia lbpm-hip )
-#ADD_DEPENDENCIES( lbpm-hip copy-include )
-
-
-
--- a/hip/Color.hip
+++ b/hip/Color.hip
--- a/hip/CudaExtras.hip
+++ b/hip/CudaExtras.hip
--- a/hip/D3Q19.hip
+++ b/hip/D3Q19.hip
--- a/hip/D3Q7.hip
+++ b/hip/D3Q7.hip
--- a/hip/D3Q7BC.hip
+++ b/hip/D3Q7BC.hip
--- a/hip/Extras.hip
+++ b/hip/Extras.hip
--- a/hip/FreeLee.hip
+++ b/hip/FreeLee.hip
--- a/hip/Greyscale.hip
+++ b/hip/Greyscale.hip
--- a/hip/GreyscaleColor.hip
+++ b/hip/GreyscaleColor.hip
--- a/hip/Ion.hip
+++ b/hip/Ion.hip
--- a/hip/MRT.hip
+++ b/hip/MRT.hip
--- a/hip/MixedGradient.hip
+++ b/hip/MixedGradient.hip
--- a/hip/Poisson.hip
+++ b/hip/Poisson.hip
--- a/hip/Stokes.hip
+++ b/hip/Stokes.hip
--- a/hip/dfh.hip
+++ b/hip/dfh.hip