SegmentLinking · slava77 · May 2, 2024 · Apr 30, 2024 · Apr 30, 2024 · Apr 30, 2024
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ ROCMINCLUDE = -I${ROCM_ROOT}/include
 ALPAKA_CPU  = -DALPAKA_ACC_CPU_B_SEQ_T_SEQ_ENABLED
 ALPAKA_CUDA = -DALPAKA_ACC_GPU_CUDA_ENABLED -DALPAKA_HOST_ONLY
 ALPAKA_ROCM = -DALPAKA_ACC_GPU_HIP_ENABLED -DALPAKA_HOST_ONLY -DALPAKA_DISABLE_VENDOR_RNG -D__HIP_PLATFORM_HCC__ -D__HIP_PLATFORM_AMD__
-EXTRAFLAGS  = -ITMultiDrawTreePlayer -Wunused-variable -lTMVA -lEG -lGenVector -lXMLIO -lMLP -lTreePlayer -fopenmp
+EXTRAFLAGS  = -ITMultiDrawTreePlayer -Wunused-variable -lTMVA -lEG -lGenVector -lXMLIO -lMLP -lTreePlayer -fopenmp -DLST_STANDALONE
 DOQUINTUPLET =
 PTCUTFLAG    =
 CUTVALUEFLAG =

diff --git a/SDL/EndcapGeometry.h b/SDL/EndcapGeometry.h
@@ -9,7 +9,11 @@
 #include <vector>
 #include <stdexcept>
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#endif
 
 #include "HeterogeneousCore/AlpakaInterface/interface/host.h"
 

diff --git a/SDL/Event.h b/SDL/Event.h
@@ -1,8 +1,15 @@
 #ifndef Event_cuh
 #define Event_cuh
 
-#include "Hit.h"
+#ifdef LST_STANDALONE
+#include "Constants.h"
 #include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
+#include "Hit.h"
 #include "ModuleMethods.h"
 #include "Segment.h"
 #include "Triplet.h"
@@ -11,7 +18,6 @@
 #include "MiniDoublet.h"
 #include "PixelTriplet.h"
 #include "TrackCandidate.h"
-#include "Constants.h"
 
 #include "HeterogeneousCore/AlpakaInterface/interface/host.h"
 
@@ -179,9 +185,7 @@ namespace SDL {
     modulesBuffer<alpaka::DevCpu>* getModules(bool isFull = false);
 
     //read from file and init
-    static void initModules(QueueAcc& queue,
-                            const MapPLStoLayer& pLStoLayer,
-                            const char* moduleMetaDataFilePath);
+    static void initModules(QueueAcc& queue, const MapPLStoLayer& pLStoLayer, const char* moduleMetaDataFilePath);
   };
 
 }  // namespace SDL

diff --git a/SDL/Globals.h b/SDL/Globals.h
@@ -1,8 +1,14 @@
 #ifndef Globals_h
 #define Globals_h
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
 #include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "TiltedGeometry.h"
 #include "EndcapGeometry.h"
 #include "ModuleConnectionMap.h"

diff --git a/SDL/Hit.h b/SDL/Hit.h
@@ -1,8 +1,13 @@
 #ifndef Hit_cuh
 #define Hit_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
 #include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
 
 namespace SDL {
   struct hits {

diff --git a/SDL/Kernels.h b/SDL/Kernels.h
@@ -1,14 +1,20 @@
 #ifndef Kernels_cuh
 #define Kernels_cuh
 
+#ifdef LST_STANDALONE
+#include "Constants.h"
 #include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "Hit.h"
 #include "MiniDoublet.h"
 #include "Segment.h"
 #include "Triplet.h"
 #include "Quintuplet.h"
 #include "PixelTriplet.h"
-#include "Constants.h"
 
 namespace SDL {
   ALPAKA_FN_ACC ALPAKA_FN_INLINE void rmQuintupletFromMemory(struct SDL::quintuplets& quintupletsInGPU,

diff --git a/SDL/LST.cc b/SDL/LST.cc
@@ -1,12 +1,27 @@
+#ifdef LST_STANDALONE
 #include "LST.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/LST.h"
+#endif
+
 #include "Event.h"
 #include "Globals.h"
 
 #include "Math/Vector3D.h"
 using XYZVector = ROOT::Math::XYZVector;
 
 namespace {
-  std::string trackLooperDir() { return getenv("LST_BASE"); }
+  std::string trackLooperDir() {
+    const char* path = getenv("LST_BASE");
+    std::string path_str;
+    if (path != nullptr) {
+      path_str = path;
+    } else {
+      path_str = getenv("CMSSW_BASE");
+      path_str += "/src/RecoTracker/LSTCore/TrackLooper";
+    }
+    return path_str;
+  }
 
   std::string get_absolute_path_after_check_file_exists(const std::string name) {
     std::filesystem::path fullpath = std::filesystem::absolute(name.c_str());

diff --git a/SDL/LST.h b/SDL/LST.h
@@ -1,7 +1,11 @@
 #ifndef LST_H
 #define LST_H
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#endif
 
 #include <filesystem>
 #include <cstdlib>

diff --git a/SDL/Makefile b/SDL/Makefile
@@ -44,9 +44,9 @@ LIBS=$(LIB_CPU) $(LIB_CUDA) $(LIB_ROCM)
 GENCODE_CUDA := -gencode arch=compute_70,code=[sm_70,compute_70] -gencode arch=compute_89,code=[sm_89,compute_89]
 
 CXX                  = g++
-CXXFLAGS_CPU         = -march=native -mtune=native -Ofast -fno-reciprocal-math -fopenmp-simd -g -Wall -Wshadow -Woverloaded-virtual -fPIC -fopenmp -I..
-CXXFLAGS_CUDA        = -O3 -g --compiler-options -Wall --compiler-options -Wshadow --compiler-options -Woverloaded-virtual --compiler-options -fPIC --compiler-options -fopenmp -dc -lineinfo --ptxas-options=-v --cudart shared $(GENCODE_CUDA) --use_fast_math --default-stream per-thread -I..
-CXXFLAGS_ROCM        = -O3 -g -Wall -Wshadow -Woverloaded-virtual -fPIC -I${ROCM_ROOT}/include -I..
+CXXFLAGS_CPU         = -march=native -mtune=native -Ofast -fno-reciprocal-math -fopenmp-simd -g -Wall -Wshadow -Woverloaded-virtual -fPIC -fopenmp -DLST_STANDALONE -I..
+CXXFLAGS_CUDA        = -O3 -g --compiler-options -Wall --compiler-options -Wshadow --compiler-options -Woverloaded-virtual --compiler-options -fPIC --compiler-options -fopenmp -dc -lineinfo --ptxas-options=-v --cudart shared $(GENCODE_CUDA) --use_fast_math --default-stream per-thread -DLST_STANDALONE -I..
+CXXFLAGS_ROCM        = -O3 -g -Wall -Wshadow -Woverloaded-virtual -fPIC -I${ROCM_ROOT}/include -DLST_STANDALONE -I..
 CMSSWINCLUDE        := -I${CMSSW_BASE}/src
 ifdef CMSSW_RELEASE_BASE
 CMSSWINCLUDE        := ${CMSSWINCLUDE} -I${CMSSW_RELEASE_BASE}/src

diff --git a/SDL/MiniDoublet.h b/SDL/MiniDoublet.h
@@ -1,9 +1,15 @@
 #ifndef MiniDoublet_cuh
 #define MiniDoublet_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
-#include "EndcapGeometry.h"
 #include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
+#include "EndcapGeometry.h"
 #include "Hit.h"
 
 namespace SDL {

diff --git a/SDL/Module.h b/SDL/Module.h
@@ -2,7 +2,12 @@
 #define Module_cuh
 
 #include <alpaka/alpaka.hpp>
+
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#endif
 
 namespace SDL {
   enum SubDet { InnerPixel = 0, Barrel = 5, Endcap = 4 };

diff --git a/SDL/ModuleConnectionMap.h b/SDL/ModuleConnectionMap.h
@@ -8,7 +8,11 @@
 #include <sstream>
 #include <algorithm>
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#endif
 
 namespace SDL {
   //FIXME: move to non-alpaka single arch build

diff --git a/SDL/ModuleMethods.h b/SDL/ModuleMethods.h
@@ -4,8 +4,14 @@
 #include <map>
 #include <iostream>
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
 #include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "TiltedGeometry.h"
 #include "EndcapGeometry.h"
 #include "ModuleConnectionMap.h"

diff --git a/SDL/NeuralNetwork.h b/SDL/NeuralNetwork.h
@@ -1,11 +1,17 @@
 #ifndef NeuralNetwork_cuh
 #define NeuralNetwork_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "NeuralNetworkWeights.h"
 #include "Segment.h"
 #include "MiniDoublet.h"
-#include "Module.h"
 #include "Hit.h"
 #include "Triplet.h"
 

diff --git a/SDL/PixelMap.h b/SDL/PixelMap.h
@@ -4,7 +4,11 @@
 #include <vector>
 #include <cstdint>
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#endif
 
 namespace SDL {
   // PixelMap is never allocated on the device.

diff --git a/SDL/PixelTriplet.h b/SDL/PixelTriplet.h
@@ -1,11 +1,17 @@
 #ifndef PixelTriplet_cuh
 #define PixelTriplet_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "Triplet.h"
 #include "Segment.h"
 #include "MiniDoublet.h"
-#include "Module.h"
 #include "Hit.h"
 #include "Quintuplet.h"
 
@@ -1878,10 +1884,16 @@ namespace SDL {
 #ifndef PixelQuintuplet_cuh
 #define PixelQuintuplet_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "Segment.h"
 #include "MiniDoublet.h"
-#include "Module.h"
 #include "Hit.h"
 #include "Triplet.h"
 #include "Quintuplet.h"

diff --git a/SDL/Quintuplet.h b/SDL/Quintuplet.h
@@ -1,12 +1,18 @@
 #ifndef Quintuplet_cuh
 #define Quintuplet_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "NeuralNetwork.h"
 #include "EndcapGeometry.h"
 #include "Segment.h"
 #include "MiniDoublet.h"
-#include "Module.h"
 #include "Hit.h"
 #include "Triplet.h"
 

diff --git a/SDL/Segment.h b/SDL/Segment.h
@@ -1,10 +1,16 @@
 #ifndef Segment_cuh
 #define Segment_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "EndcapGeometry.h"
 #include "MiniDoublet.h"
-#include "Module.h"
 #include "Hit.h"
 
 namespace SDL {

diff --git a/SDL/TiltedGeometry.h b/SDL/TiltedGeometry.h
@@ -9,7 +9,11 @@
 #include <string>
 #include <stdexcept>
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#endif
 
 namespace SDL {
   template <typename>

diff --git a/SDL/TrackCandidate.h b/SDL/TrackCandidate.h
@@ -1,13 +1,19 @@
 #ifndef TrackCandidate_cuh
 #define TrackCandidate_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "Triplet.h"
 #include "Segment.h"
 #include "MiniDoublet.h"
 #include "PixelTriplet.h"
 #include "Quintuplet.h"
-#include "Module.h"
 #include "Hit.h"
 
 namespace SDL {

diff --git a/SDL/Triplet.h b/SDL/Triplet.h
@@ -1,10 +1,16 @@
 #ifndef Triplet_cuh
 #define Triplet_cuh
 
+#ifdef LST_STANDALONE
 #include "Constants.h"
+#include "Module.h"
+#else
+#include "RecoTracker/LSTCore/interface/alpaka/Constants.h"
+#include "RecoTracker/LSTCore/interface/alpaka/Module.h"
+#endif
+
 #include "Segment.h"
 #include "MiniDoublet.h"
-#include "Module.h"
 #include "Hit.h"
 
 namespace SDL {