Remove unneccesary #includes

FLAMEGPU · Jul 8, 2021 · 758350a · 758350a
1 parent 0d5fb46
commit 758350a
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 13 deletions.
diff --git a/include/flamegpu/runtime/AgentFunction.cuh b/include/flamegpu/runtime/AgentFunction.cuh
@@ -2,14 +2,11 @@
 #define INCLUDE_FLAMEGPU_RUNTIME_AGENTFUNCTION_CUH_
 
 #include <cuda_runtime.h>
-#include <device_launch_parameters.h>
 #include <curand_kernel.h>
 
-// #include "flamegpu/runtime/flamegpu_device_api.h"
 #include "flamegpu/defines.h"
 #include "flamegpu/exception/FLAMEGPUDeviceException.h"
 #include "flamegpu/runtime/AgentFunction_shim.h"
-#include "flamegpu/gpu/CUDAScanCompaction.h"
 
 namespace flamegpu {
 

diff --git a/include/flamegpu/runtime/AgentFunctionCondition.h b/include/flamegpu/runtime/AgentFunctionCondition.h
@@ -2,11 +2,9 @@
 #define INCLUDE_FLAMEGPU_RUNTIME_AGENTFUNCTIONCONDITION_H_
 
 #include <cuda_runtime.h>
-#include <device_launch_parameters.h>
 
 #include "flamegpu/runtime/DeviceAPI.h"
 #include "flamegpu/runtime/AgentFunctionCondition_shim.h"
-#include "flamegpu/gpu/CUDAScanCompaction.h"
 
 namespace flamegpu {
 

diff --git a/include/flamegpu/runtime/DeviceAPI.h b/include/flamegpu/runtime/DeviceAPI.h
@@ -6,16 +6,13 @@
 #include <cstdint>
 #include <limits>
 
-// #include "flamegpu/gpu/CUDAErrorChecking.cuh"            // required for CUDA error handling functions
 #ifndef __CUDACC_RTC__
 #include "flamegpu/runtime/cuRVE/curve.h"
 #else
 #include "dynamic/curve_rtc_dynamic.h"
 #endif  // !_RTC
-// #include "flamegpu/exception/FLAMEGPUException.h"
 #include "flamegpu/runtime/utility/AgentRandom.cuh"
 #include "flamegpu/runtime/utility/DeviceEnvironment.cuh"
-#include "flamegpu/gpu/CUDAScanCompaction.h"
 #include "flamegpu/runtime/AgentFunction.cuh"
 #include "flamegpu/runtime/AgentFunctionCondition.h"
 #include "flamegpu/runtime/messaging_device.h"

diff --git a/include/flamegpu/runtime/messaging/BruteForce/BruteForceHost.h b/include/flamegpu/runtime/messaging/BruteForce/BruteForceHost.h
@@ -11,8 +11,6 @@
 
 #include "flamegpu/model/Variable.h"
 #include "flamegpu/gpu/detail/CUDAErrorChecking.cuh"
-#include "flamegpu/gpu/CUDAScanCompaction.h"
-#include "flamegpu/util/nvtx.h"
 #include "flamegpu/runtime/cuRVE/curve.h"
 
 #include "flamegpu/runtime/messaging/None/NoneHost.h"

diff --git a/src/flamegpu/gpu/CUDAFatAgent.cu b/src/flamegpu/gpu/CUDAFatAgent.cu
@@ -2,6 +2,7 @@
 
 #include "flamegpu/gpu/CUDAScatter.h"
 #include "flamegpu/runtime/HostAPI.h"
+#include "flamegpu/util/nvtx.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 1)

diff --git a/src/flamegpu/gpu/CUDAMessageList.cu b/src/flamegpu/gpu/CUDAMessageList.cu
@@ -6,7 +6,6 @@
 #include "flamegpu/gpu/CUDAMessage.h"
 #include "flamegpu/gpu/detail/CUDAErrorChecking.cuh"
 #include "flamegpu/runtime/messaging/BruteForce/BruteForceHost.h"
-#include "flamegpu/gpu/CUDAScanCompaction.h"
 #include "flamegpu/gpu/CUDAScatter.h"
 
 namespace flamegpu {

diff --git a/src/flamegpu/gpu/CUDAScatter.cu b/src/flamegpu/gpu/CUDAScatter.cu
@@ -6,7 +6,6 @@
 
 #include "flamegpu/gpu/detail/CUDAErrorChecking.cuh"
 #include "flamegpu/gpu/CUDAFatAgentStateList.h"
-#include "flamegpu/gpu/CUDAScanCompaction.h"
 
 #ifdef _MSC_VER
 #pragma warning(push, 1)

diff --git a/tests/test_cases/runtime/messaging/test_brute_force.cu b/tests/test_cases/runtime/messaging/test_brute_force.cu
@@ -113,7 +113,6 @@ TEST(TestMessage_BruteForce, Mandatory1) {
 /**
  * Ensures messages are correct on 2nd step
  */
-#include "flamegpu/gpu/CUDAScanCompaction.h"
 TEST(TestMessage_BruteForce, Mandatory2) {
     ModelDescription m(MODEL_NAME);
     MsgBruteForce::Description &msg = m.newMessage(MESSAGE_NAME);