WIP: shuffling around header files.

lab-cosmo · Jan 12, 2024 · c6e0dbb · c6e0dbb
1 parent 712ef16
commit c6e0dbb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10)
-project(sphericart_examples LANGUAGES C CXX CUDA)
+project(sphericart LANGUAGES C CXX CUDA)
 
 add_executable(example_cpp cpp/example.cpp)
 target_link_libraries(example_cpp sphericart)
@@ -13,7 +13,7 @@ add_test(NAME example_c COMMAND ./example_c)
 if (CMAKE_CUDA_COMPILER AND SPHERICART_ENABLE_CUDA)
 
     set(CMAKE_CUDA_ARCHITECTURES native)
-    
+
     add_executable(example_cuda cuda/example.cu)
     target_link_libraries(example_cuda sphericart)
     add_test(NAME example_cuda COMMAND ./example_cuda)

diff --git a/examples/cuda/example.cu b/examples/cuda/example.cu
@@ -7,9 +7,11 @@
 #include <cuda.h>
 #include <cuda_runtime.h>
 #include <iostream>
-
+#include <vector>
 #include "sphericart_cuda.hpp"
 
+using namespace std;
+using namespace sphericart::cuda;
 
 /*host macro that checks for errors in CUDA calls, and prints the file + line
  * and error string if one occurs
@@ -24,7 +26,7 @@
             exit(EXIT_FAILURE);                                                \
         }                                                                      \
     } while (0)
-    
+
 int main() {
     /* ===== set up the calculation ===== */
 

diff --git a/sphericart/include/sphericart_cuda.hpp b/sphericart/include/sphericart_cuda.hpp
@@ -4,7 +4,7 @@
 #ifndef SPHERICART_CUDA_HPP
 #define SPHERICART_CUDA_HPP
 
-#include "sphericart.hpp"
+//#include "sphericart.hpp"
 
 namespace sphericart {
 
@@ -16,7 +16,7 @@ namespace cuda {
  * stores the buffers that are necessary to compute the spherical harmonics
  * efficiently.
  */
-template <typename T> SPHERICART_EXPORT class SphericalHarmonics {
+template <typename T> class SphericalHarmonics {
   public:
     /** Initialize the SphericalHarmonics class setting maximum degree and
      * normalization