merge with master

luchete80 · Nov 13, 2015 · 3735ce8 · 3735ce8
2 parents 6bd09bc + 763c40b
commit 3735ce8
Show file tree

Hide file tree

Showing 50 changed files with 61,587 additions and 62,427 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+msvc
 build
 Debug
 Release

diff --git a/src/configs/F b/src/configs/F
diff --git a/src/configs/K b/src/configs/K
diff --git a/src/configs/PCGF b/src/configs/PCGF
diff --git a/src/configs/PCGV b/src/configs/PCGV
diff --git a/src/configs/PCGVGS b/src/configs/PCGVGS
diff --git a/src/configs/PCGW b/src/configs/PCGW
diff --git a/src/configs/SMOOTHER_ONLY b/src/configs/SMOOTHER_ONLY
diff --git a/src/configs/V b/src/configs/V
diff --git a/src/configs/W b/src/configs/W
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -75,53 +75,25 @@ ENDIF()
 #END CMAKE SETTING CUDA_NVCC_FLAGS
 ###################
 
-include_directories(
-	${CMAKE_CURRENT_SOURCE_DIR}
-	${CMAKE_CURRENT_SOURCE_DIR}/include
-	${CMAKE_CURRENT_SOURCE_DIR}/include/cycles
-	${CMAKE_CURRENT_SOURCE_DIR}/include/smoothers
-	${CMAKE_CURRENT_SOURCE_DIR}/aggmis/include
-	${METIS_PATH}/Lib
-)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/cycles)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include/smoothers)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/aggmis/include)
+include_directories(${METIS_PATH}/Lib)
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
-set(CORE_CUDA_SOURCES
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/aggregator.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/mis.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/randMIS.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/amg.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/amg_config.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/amg_level.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/amg_signal.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/cgcycle.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/allocator.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/ComputePermutationMethods.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/cutil.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/smoothedMG_amg_level.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/smoother.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/gauss_seidel.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/FEM2D.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/FEM3D.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/tetmesh.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/AggMIS_Types.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/misHelpers.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/randomizedMIS_GPU.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/setup_solver.cu"
-        "${CMAKE_CURRENT_SOURCE_DIR}/cuda/cuda_resources.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_Aggregation_CPU.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_Aggregation_GPU.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_GraphHelpers.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_IOHelpers.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_MergeSplitConditioner_CPU.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_MergeSplitConditioner.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_MIS_CPU.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/AggMIS_MIS_GPU.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/TriMesh_connectivity.cu"
-	"${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/TriMesh_io.cu"
-)
-
-set(CORE_CUDA_HEADERS
-	"${CMAKE_CURRENT_SOURCE_DIR}/cuda/perform_element_loop_3D.cuh"
-)
+FILE(GLOB CORE_CUDA_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cuda/*.cu
+							${CMAKE_CURRENT_SOURCE_DIR}/aggmis/cuda/*.cu)
+
+FILE(GLOB CORE_CUDA_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/include/smoothers/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/include/smoothedMG/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/include/smoothedMG/aggregators/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/include/FEM/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/include/cycles/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/aggmis/include/*.h
+							${CMAKE_CURRENT_SOURCE_DIR}/cuda/perform_element_loop_3D.cuh
+							${CMAKE_CURRENT_SOURCE_DIR}/cuda/perform_element_loop_2D.cuh)
 
 CUDA_ADD_LIBRARY(FEM_CORE STATIC ${CORE_CUDA_SOURCES} ${CORE_CUDA_HEADERS})
 ADD_DEPENDENCIES(FEM_CORE metis)
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    msvc
     build
     Debug
     Release
@@ Expand Down @@