diff --git a/CMakeLists.txt b/CMakeLists.txt index 305ddbb..7c48b25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,19 +8,21 @@ set(CMAKE_CXX_COMPILER g++) set(CMAKE_CXX_STANDARD 14) -set(SOURCES src/simulation_logic.cu src/random_generator.cu src/SimulationMap.cu src/Polyhedron.cu src/Particle.cu - src/MapNode.cu src/SpacePoint.cu src/Face.cu src/visualization_integration.cu) +set(SOURCES src/main_logic/simulation_logic.cu src/external/random_generator.cu src/simulation_objects/SimulationMap.cu + src/simulation_objects/geometric/Polyhedron.cu src/simulation_objects/Particle.cu + src/simulation_objects/MapNode.cu src/simulation_objects/geometric/SpacePoint.cu + src/simulation_objects/geometric/Face.cu src/external/visualization_integration.cu) option(COMPILE_FOR_CPU "Make produced executable run on CPU instead of GPU" OFF) if(COMPILE_FOR_CPU) - list(APPEND SOURCES src/main.cpp) + list(APPEND SOURCES src/main_logic/main.cpp) set_source_files_properties(${SOURCES} PROPERTIES LANGUAGE CXX) add_definitions(-x c++) add_definitions(-DCOMPILE_FOR_CPU -D__host__= -D__device__= -D__global__=) else() - list(APPEND SOURCES src/main.cu) + list(APPEND SOURCES src/main_logic/main.cu) endif() add_executable(minds_crawl ${SOURCES}) diff --git a/src/random_generator.cu b/src/external/random_generator.cu similarity index 95% rename from src/random_generator.cu rename to src/external/random_generator.cu index 145e178..b19514f 100644 --- a/src/random_generator.cu +++ b/src/external/random_generator.cu @@ -10,7 +10,7 @@ std::uniform_real_distribution distribution(0., 1.); #include "curand_kernel.h" -#include "common.cuh" +#include "../common.cuh" #include "random_generator.cuh" diff --git a/src/random_generator.cuh b/src/external/random_generator.cuh similarity index 100% rename from src/random_generator.cuh rename to src/external/random_generator.cuh diff --git a/src/visualization_integration.cu b/src/external/visualization_integration.cu similarity index 97% rename from src/visualization_integration.cu rename to src/external/visualization_integration.cu index 9e75328..c14c7ce 100644 --- a/src/visualization_integration.cu +++ b/src/external/visualization_integration.cu @@ -3,7 +3,7 @@ #include #include "visualization_integration.cuh" -#include "Particle.cuh" +#include "../simulation_objects/Particle.cuh" __host__ std::string get_visualization_endpoint() diff --git a/src/visualization_integration.cuh b/src/external/visualization_integration.cuh similarity index 96% rename from src/visualization_integration.cuh rename to src/external/visualization_integration.cuh index 5431c9a..4aed3f4 100644 --- a/src/visualization_integration.cuh +++ b/src/external/visualization_integration.cuh @@ -2,9 +2,9 @@ #define MINDS_CRAWL_VISUALIZATION_INTEGRATION_CUH -#include "../lib/HTTPRequest/include/HTTPRequest.hpp" +#include "../../lib/HTTPRequest/include/HTTPRequest.hpp" -#include "MapNode.cuh" +#include "../simulation_objects/MapNode.cuh" #include diff --git a/src/iterations_wrapper.cuh b/src/main_logic/iterations_wrapper.cuh similarity index 97% rename from src/iterations_wrapper.cuh rename to src/main_logic/iterations_wrapper.cuh index a596b25..2481585 100644 --- a/src/iterations_wrapper.cuh +++ b/src/main_logic/iterations_wrapper.cuh @@ -9,14 +9,14 @@ #include -#include "SimulationMap.cuh" -#include "Polyhedron.cuh" -#include "MapNode.cuh" -#include "Particle.cuh" +#include "../simulation_objects/SimulationMap.cuh" +#include "../simulation_objects/geometric/Polyhedron.cuh" +#include "../simulation_objects/MapNode.cuh" +#include "../simulation_objects/Particle.cuh" #include "simulation_logic.cuh" -#include "random_generator.cuh" -#include "jones_constants.hpp" -#include "common.cuh" +#include "../external/random_generator.cuh" +#include "../jones_constants.hpp" +#include "../common.cuh" namespace jc = jones_constants; diff --git a/src/main.cpp b/src/main_logic/main.cpp similarity index 97% rename from src/main.cpp rename to src/main_logic/main.cpp index 6f7b795..e2a7602 100644 --- a/src/main.cpp +++ b/src/main_logic/main.cpp @@ -3,7 +3,7 @@ #include "simulation_logic.cuh" #include "iterations_wrapper.cuh" -#include "visualization_integration.cuh" +#include "../external/visualization_integration.cuh" void wrapped_run_iteration_project_nutrients(SimulationMap *const simulation_map, const int *const iteration_number) diff --git a/src/main.cu b/src/main_logic/main.cu similarity index 98% rename from src/main.cu rename to src/main_logic/main.cu index b4cbccc..7b02805 100644 --- a/src/main.cu +++ b/src/main_logic/main.cu @@ -3,8 +3,8 @@ #include "simulation_logic.cuh" #include "iterations_wrapper.cuh" -#include "visualization_integration.cuh" -#include "random_generator.cuh" +#include "../external/visualization_integration.cuh" +#include "../external/random_generator.cuh" const int cuda_block_size = 256; diff --git a/src/simulation_logic.cu b/src/main_logic/simulation_logic.cu similarity index 97% rename from src/simulation_logic.cu rename to src/main_logic/simulation_logic.cu index 72a6ffa..14f3260 100644 --- a/src/simulation_logic.cu +++ b/src/main_logic/simulation_logic.cu @@ -5,9 +5,9 @@ #include #include "simulation_logic.cuh" -#include "random_generator.cuh" -#include "Particle.cuh" -#include "jones_constants.hpp" +#include "../external/random_generator.cuh" +#include "../simulation_objects/Particle.cuh" +#include "../jones_constants.hpp" namespace jc = jones_constants; diff --git a/src/simulation_logic.cuh b/src/main_logic/simulation_logic.cuh similarity index 97% rename from src/simulation_logic.cuh rename to src/main_logic/simulation_logic.cuh index ab37ee3..1747b0e 100644 --- a/src/simulation_logic.cuh +++ b/src/main_logic/simulation_logic.cuh @@ -2,9 +2,9 @@ #define MINDS_CRAWL_SIMULATION_LOGIC_CUH -#include "MapNode.cuh" -#include "SimulationMap.cuh" -#include "common.cuh" +#include "../simulation_objects/MapNode.cuh" +#include "../simulation_objects/SimulationMap.cuh" +#include "../common.cuh" /** diff --git a/src/MapNode.cu b/src/simulation_objects/MapNode.cu similarity index 99% rename from src/MapNode.cu rename to src/simulation_objects/MapNode.cu index 80a5401..b8d8207 100644 --- a/src/MapNode.cu +++ b/src/simulation_objects/MapNode.cu @@ -2,7 +2,7 @@ #include "MapNode.cuh" #include "Particle.cuh" -#include "Polyhedron.cuh" +#include "geometric/Polyhedron.cuh" __host__ __device__ MapNode::MapNode(Polyhedron *polyhedron, Face *polyhedron_face, SpacePoint coordinates) : diff --git a/src/MapNode.cuh b/src/simulation_objects/MapNode.cuh similarity index 99% rename from src/MapNode.cuh rename to src/simulation_objects/MapNode.cuh index 3cfbdd4..ec2f2fb 100644 --- a/src/MapNode.cuh +++ b/src/simulation_objects/MapNode.cuh @@ -2,9 +2,9 @@ #define MINDS_CRAWL_MAPNODE_CUH -#include "common.cuh" -#include "SpacePoint.cuh" -#include "Face.cuh" +#include "../common.cuh" +#include "geometric/SpacePoint.cuh" +#include "geometric/Face.cuh" class Particle; diff --git a/src/Particle.cu b/src/simulation_objects/Particle.cu similarity index 98% rename from src/Particle.cu rename to src/simulation_objects/Particle.cu index fb21492..b6e13b5 100644 --- a/src/Particle.cu +++ b/src/simulation_objects/Particle.cu @@ -1,7 +1,7 @@ #include "Particle.cuh" #include "MapNode.cuh" -#include "random_generator.cuh" -#include "jones_constants.hpp" +#include "../external/random_generator.cuh" +#include "../jones_constants.hpp" namespace jc = jones_constants; diff --git a/src/Particle.cuh b/src/simulation_objects/Particle.cuh similarity index 98% rename from src/Particle.cuh rename to src/simulation_objects/Particle.cuh index 14ec8d9..8607c58 100644 --- a/src/Particle.cuh +++ b/src/simulation_objects/Particle.cuh @@ -2,9 +2,9 @@ #define MINDS_CRAWL_PARTICLE_CUH -#include "Face.cuh" -#include "Polyhedron.cuh" -#include "SpacePoint.cuh" +#include "geometric/Face.cuh" +#include "geometric/Polyhedron.cuh" +#include "geometric/SpacePoint.cuh" class MapNode; diff --git a/src/SimulationMap.cu b/src/simulation_objects/SimulationMap.cu similarity index 98% rename from src/SimulationMap.cu rename to src/simulation_objects/SimulationMap.cu index 8dd8349..1020a5f 100644 --- a/src/SimulationMap.cu +++ b/src/simulation_objects/SimulationMap.cu @@ -2,10 +2,10 @@ #include #include "SimulationMap.cuh" -#include "Polyhedron.cuh" -#include "Face.cuh" -#include "jones_constants.hpp" -#include "random_generator.cuh" +#include "geometric/Polyhedron.cuh" +#include "geometric/Face.cuh" +#include "../jones_constants.hpp" +#include "../external/random_generator.cuh" typedef bool(MapNode::*SetNodeMethod)(MapNode *); diff --git a/src/SimulationMap.cuh b/src/simulation_objects/SimulationMap.cuh similarity index 98% rename from src/SimulationMap.cuh rename to src/simulation_objects/SimulationMap.cuh index 577eac6..cd697c8 100644 --- a/src/SimulationMap.cuh +++ b/src/simulation_objects/SimulationMap.cuh @@ -3,8 +3,8 @@ #include "MapNode.cuh" -#include "simulation_logic.cuh" -#include "common.cuh" +#include "../main_logic/simulation_logic.cuh" +#include "../common.cuh" /// Object describing a simulation's map diff --git a/src/Face.cu b/src/simulation_objects/geometric/Face.cu similarity index 97% rename from src/Face.cu rename to src/simulation_objects/geometric/Face.cu index e2cd670..7e44d3e 100644 --- a/src/Face.cu +++ b/src/simulation_objects/geometric/Face.cu @@ -1,9 +1,9 @@ #include #include "Face.cuh" -#include "MapNode.cuh" +#include "../MapNode.cuh" #include "Polyhedron.cuh" -#include "common.cuh" +#include "../../common.cuh" __host__ __device__ SpacePoint calculate_normal(const SpacePoint *vertices) diff --git a/src/Face.cuh b/src/simulation_objects/geometric/Face.cuh similarity index 100% rename from src/Face.cuh rename to src/simulation_objects/geometric/Face.cuh diff --git a/src/Polyhedron.cu b/src/simulation_objects/geometric/Polyhedron.cu similarity index 99% rename from src/Polyhedron.cu rename to src/simulation_objects/geometric/Polyhedron.cu index 2112e6f..cba2890 100644 --- a/src/Polyhedron.cu +++ b/src/simulation_objects/geometric/Polyhedron.cu @@ -6,7 +6,7 @@ #include #include "Polyhedron.cuh" -#include "common.cuh" +#include "../../common.cuh" __host__ __device__ Polyhedron::Polyhedron(Face *faces, int n_of_faces) : diff --git a/src/Polyhedron.cuh b/src/simulation_objects/geometric/Polyhedron.cuh similarity index 100% rename from src/Polyhedron.cuh rename to src/simulation_objects/geometric/Polyhedron.cuh diff --git a/src/SpacePoint.cu b/src/simulation_objects/geometric/SpacePoint.cu similarity index 100% rename from src/SpacePoint.cu rename to src/simulation_objects/geometric/SpacePoint.cu diff --git a/src/SpacePoint.cuh b/src/simulation_objects/geometric/SpacePoint.cuh similarity index 100% rename from src/SpacePoint.cuh rename to src/simulation_objects/geometric/SpacePoint.cuh