Moved SoA macros to CUDADataFormats/Common

cms-sw · Apr 6, 2022 · f711732 · f711732
1 parent a42d7ad
commit f711732
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/DataFormats/Common/interface/SoACommon.h → CUDADataFormats/Common/interface/SoACommon.h b/DataFormats/Common/interface/SoACommon.h → CUDADataFormats/Common/interface/SoACommon.h
diff --git a/DataFormats/Common/interface/SoAStore.h → CUDADataFormats/Common/interface/SoAStore.h b/DataFormats/Common/interface/SoAStore.h → CUDADataFormats/Common/interface/SoAStore.h
diff --git a/DataFormats/Common/interface/SoAView.h → CUDADataFormats/Common/interface/SoAView.h b/DataFormats/Common/interface/SoAView.h → CUDADataFormats/Common/interface/SoAView.h
diff --git a/CUDADataFormats/Common/test/BuildFile.xml b/CUDADataFormats/Common/test/BuildFile.xml
@@ -6,3 +6,8 @@
   </bin>
 
 </iftool>
+
+<bin file="SoAStoreView_t.cc">
+  <use name="eigen"/>
+  <use name="boost"/>
+</bin>
diff --git a/DataFormats/Common/test/SoAStoreView_t.cc → ...DataFormats/Common/test/SoAStoreView_t.cc b/DataFormats/Common/test/SoAStoreView_t.cc → ...DataFormats/Common/test/SoAStoreView_t.cc
@@ -9,8 +9,8 @@
 #include <cassert>
 #include <memory>
 
-#include "DataFormats/Common/interface/SoAStore.h"
-#include "DataFormats/Common/interface/SoAView.h"
+#include "CUDADataFormats/Common/interface/SoAStore.h"
+#include "CUDADataFormats/Common/interface/SoAView.h"
 #include "Eigen/Geometry"
 
 generate_SoA_store(SoAHostDevice,

diff --git a/DataFormats/Common/test/BuildFile.xml b/DataFormats/Common/test/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="boost"/>
 <use name="cppunit"/>
 <use name="DataFormats/Common"/>
-<use name="Eigen"/>
 <bin name="testDataFormatsCommon" file="testRunner.cpp,testOwnVector.cc,testOneToOneAssociation.cc,testValueMap.cc,testOneToManyAssociation.cc,testAssociationVector.cc,testAssociationNew.cc,testValueMapNew.cc,testSortedCollection.cc,testRangeMap.cc,testIDVectorMap.cc,ref_t.cppunit.cc,DetSetRefVector_t.cppunit.cc,reftobase_t.cppunit.cc,reftobasevector_t.cppunit.cc,cloningptr_t.cppunit.cc,ptr_t.cppunit.cc,ptrvector_t.cppunit.cc,containermask_t.cppunit.cc,reftobaseprod_t.cppunit.cc,handle_t.cppunit.cc">
 </bin>
 
@@ -59,6 +58,3 @@
 
 <bin name="testMultiAssociation" file="testRunner.cpp,testMultiAssociation.cc">
 </bin>
-
-<bin file="SoAStoreView_t.cc">
-</bin>