From dc13ac526b32b4c3ad1b391fb7b97511ce7802ea Mon Sep 17 00:00:00 2001 From: Andres Rios Tascon Date: Fri, 14 Jun 2024 16:53:31 -0400 Subject: [PATCH] Removed LST_IS_CMSSW_PACKAGE flag --- RecoTracker/LSTCore/BuildFile.xml | 2 +- RecoTracker/LSTCore/interface/alpaka/LST.h | 5 ----- RecoTracker/LSTCore/interface/alpaka/LSTESData.h | 4 ---- RecoTracker/LSTCore/interface/alpaka/Module.h | 4 ---- RecoTracker/LSTCore/src/alpaka/EndcapGeometry.h | 4 ---- RecoTracker/LSTCore/src/alpaka/Event.h | 6 ------ RecoTracker/LSTCore/src/alpaka/Hit.h | 5 ----- RecoTracker/LSTCore/src/alpaka/Kernels.h | 5 ----- RecoTracker/LSTCore/src/alpaka/LST.dev.cc | 4 ---- RecoTracker/LSTCore/src/alpaka/LSTESData.dev.cc | 4 ---- RecoTracker/LSTCore/src/alpaka/MiniDoublet.h | 5 ----- RecoTracker/LSTCore/src/alpaka/ModuleConnectionMap.h | 4 ---- RecoTracker/LSTCore/src/alpaka/ModuleMethods.h | 5 ----- RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h | 5 ----- RecoTracker/LSTCore/src/alpaka/PixelMap.h | 4 ---- RecoTracker/LSTCore/src/alpaka/PixelTriplet.h | 10 ---------- RecoTracker/LSTCore/src/alpaka/Quintuplet.h | 5 ----- RecoTracker/LSTCore/src/alpaka/Segment.h | 5 ----- RecoTracker/LSTCore/src/alpaka/TiltedGeometry.h | 4 ---- RecoTracker/LSTCore/src/alpaka/TrackCandidate.h | 5 ----- RecoTracker/LSTCore/src/alpaka/Triplet.h | 5 ----- RecoTracker/LSTCore/standalone/Makefile | 2 +- RecoTracker/LSTCore/standalone/SDL/Makefile | 2 +- 23 files changed, 3 insertions(+), 101 deletions(-) diff --git a/RecoTracker/LSTCore/BuildFile.xml b/RecoTracker/LSTCore/BuildFile.xml index 69c03f883986e..2aa254e0c0f6c 100644 --- a/RecoTracker/LSTCore/BuildFile.xml +++ b/RecoTracker/LSTCore/BuildFile.xml @@ -2,7 +2,7 @@ - + diff --git a/RecoTracker/LSTCore/interface/alpaka/LST.h b/RecoTracker/LSTCore/interface/alpaka/LST.h index a95f9343daf89..16f3e87361489 100644 --- a/RecoTracker/LSTCore/interface/alpaka/LST.h +++ b/RecoTracker/LSTCore/interface/alpaka/LST.h @@ -1,13 +1,8 @@ #ifndef LST_H #define LST_H -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/LSTESData.h" -#else -#include "Constants.h" -#include "LSTESData.h" -#endif #include #include diff --git a/RecoTracker/LSTCore/interface/alpaka/LSTESData.h b/RecoTracker/LSTCore/interface/alpaka/LSTESData.h index 29ae19a5484e8..12b39135766ba 100644 --- a/RecoTracker/LSTCore/interface/alpaka/LSTESData.h +++ b/RecoTracker/LSTCore/interface/alpaka/LSTESData.h @@ -1,11 +1,7 @@ #ifndef LSTESData_H #define LSTESData_H -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" -#else -#include "Constants.h" -#endif #include "HeterogeneousCore/AlpakaInterface/interface/CopyToDevice.h" diff --git a/RecoTracker/LSTCore/interface/alpaka/Module.h b/RecoTracker/LSTCore/interface/alpaka/Module.h index 0a269eaa6e16a..145aca7604bd7 100644 --- a/RecoTracker/LSTCore/interface/alpaka/Module.h +++ b/RecoTracker/LSTCore/interface/alpaka/Module.h @@ -3,11 +3,7 @@ #include -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" -#else -#include "Constants.h" -#endif namespace SDL { enum SubDet { InnerPixel = 0, Barrel = 5, Endcap = 4 }; diff --git a/RecoTracker/LSTCore/src/alpaka/EndcapGeometry.h b/RecoTracker/LSTCore/src/alpaka/EndcapGeometry.h index 93da945c00b33..8b343a70a9be8 100644 --- a/RecoTracker/LSTCore/src/alpaka/EndcapGeometry.h +++ b/RecoTracker/LSTCore/src/alpaka/EndcapGeometry.h @@ -9,11 +9,7 @@ #include #include -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" -#else -#include "Constants.h" -#endif #include "HeterogeneousCore/AlpakaInterface/interface/host.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Event.h b/RecoTracker/LSTCore/src/alpaka/Event.h index 2b02efe6e5485..11f1fe6c68898 100644 --- a/RecoTracker/LSTCore/src/alpaka/Event.h +++ b/RecoTracker/LSTCore/src/alpaka/Event.h @@ -1,15 +1,9 @@ #ifndef Event_cuh #define Event_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" #include "RecoTracker/LSTCore/interface/alpaka/LST.h" -#else -#include "Constants.h" -#include "Module.h" -#include "LST.h" -#endif #include "Hit.h" #include "ModuleMethods.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Hit.h b/RecoTracker/LSTCore/src/alpaka/Hit.h index dfe9c4c56ef95..beecee9763033 100644 --- a/RecoTracker/LSTCore/src/alpaka/Hit.h +++ b/RecoTracker/LSTCore/src/alpaka/Hit.h @@ -1,13 +1,8 @@ #ifndef Hit_cuh #define Hit_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif namespace SDL { struct hits { diff --git a/RecoTracker/LSTCore/src/alpaka/Kernels.h b/RecoTracker/LSTCore/src/alpaka/Kernels.h index 334c8e1a9eb8a..4c8e1e2910ee8 100644 --- a/RecoTracker/LSTCore/src/alpaka/Kernels.h +++ b/RecoTracker/LSTCore/src/alpaka/Kernels.h @@ -1,13 +1,8 @@ #ifndef Kernels_cuh #define Kernels_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "Hit.h" #include "MiniDoublet.h" diff --git a/RecoTracker/LSTCore/src/alpaka/LST.dev.cc b/RecoTracker/LSTCore/src/alpaka/LST.dev.cc index cf2e73c25b410..47c2b9c6546be 100644 --- a/RecoTracker/LSTCore/src/alpaka/LST.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/LST.dev.cc @@ -1,8 +1,4 @@ -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/LST.h" -#else -#include "LST.h" -#endif #include "Event.h" diff --git a/RecoTracker/LSTCore/src/alpaka/LSTESData.dev.cc b/RecoTracker/LSTCore/src/alpaka/LSTESData.dev.cc index 616c6f4bf3894..4bbcf27de877e 100644 --- a/RecoTracker/LSTCore/src/alpaka/LSTESData.dev.cc +++ b/RecoTracker/LSTCore/src/alpaka/LSTESData.dev.cc @@ -1,8 +1,4 @@ -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/LSTESData.h" -#else -#include "LSTESData.h" -#endif #include "EndcapGeometry.h" #include "ModuleConnectionMap.h" diff --git a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h index aa63d51345a7f..c91d6d825b618 100644 --- a/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h +++ b/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h @@ -1,13 +1,8 @@ #ifndef MiniDoublet_cuh #define MiniDoublet_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "EndcapGeometry.h" #include "Hit.h" diff --git a/RecoTracker/LSTCore/src/alpaka/ModuleConnectionMap.h b/RecoTracker/LSTCore/src/alpaka/ModuleConnectionMap.h index 45d629a74e00e..aea59aa5c4ff0 100644 --- a/RecoTracker/LSTCore/src/alpaka/ModuleConnectionMap.h +++ b/RecoTracker/LSTCore/src/alpaka/ModuleConnectionMap.h @@ -8,11 +8,7 @@ #include #include -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" -#else -#include "Constants.h" -#endif namespace SDL { //FIXME: move to non-alpaka single arch build diff --git a/RecoTracker/LSTCore/src/alpaka/ModuleMethods.h b/RecoTracker/LSTCore/src/alpaka/ModuleMethods.h index dc0eb0fc1f3b8..d3d2fb1ae7fd7 100644 --- a/RecoTracker/LSTCore/src/alpaka/ModuleMethods.h +++ b/RecoTracker/LSTCore/src/alpaka/ModuleMethods.h @@ -4,13 +4,8 @@ #include #include -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "TiltedGeometry.h" #include "EndcapGeometry.h" diff --git a/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h b/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h index a786e249eb664..7d7838f3752d4 100644 --- a/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h +++ b/RecoTracker/LSTCore/src/alpaka/NeuralNetwork.h @@ -1,13 +1,8 @@ #ifndef NeuralNetwork_cuh #define NeuralNetwork_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "NeuralNetworkWeights.h" #include "Segment.h" diff --git a/RecoTracker/LSTCore/src/alpaka/PixelMap.h b/RecoTracker/LSTCore/src/alpaka/PixelMap.h index d6cbdffebe096..f81e58860af90 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelMap.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelMap.h @@ -4,11 +4,7 @@ #include #include -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" -#else -#include "Constants.h" -#endif namespace SDL { // PixelMap is never allocated on the device. diff --git a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h index bd048f9c819a2..c3945238ce06f 100644 --- a/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h +++ b/RecoTracker/LSTCore/src/alpaka/PixelTriplet.h @@ -1,13 +1,8 @@ #ifndef PixelTriplet_cuh #define PixelTriplet_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "Triplet.h" #include "Segment.h" @@ -1852,13 +1847,8 @@ namespace SDL { #ifndef PixelQuintuplet_cuh #define PixelQuintuplet_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "Segment.h" #include "MiniDoublet.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h index cc17012019d6d..e0bbb5c6adf9f 100644 --- a/RecoTracker/LSTCore/src/alpaka/Quintuplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Quintuplet.h @@ -1,13 +1,8 @@ #ifndef Quintuplet_cuh #define Quintuplet_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "NeuralNetwork.h" #include "EndcapGeometry.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Segment.h b/RecoTracker/LSTCore/src/alpaka/Segment.h index 61e91eef18a47..c3d795bd8cc5f 100644 --- a/RecoTracker/LSTCore/src/alpaka/Segment.h +++ b/RecoTracker/LSTCore/src/alpaka/Segment.h @@ -1,13 +1,8 @@ #ifndef Segment_cuh #define Segment_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "EndcapGeometry.h" #include "MiniDoublet.h" diff --git a/RecoTracker/LSTCore/src/alpaka/TiltedGeometry.h b/RecoTracker/LSTCore/src/alpaka/TiltedGeometry.h index 51481762c5184..258e9333c17a3 100644 --- a/RecoTracker/LSTCore/src/alpaka/TiltedGeometry.h +++ b/RecoTracker/LSTCore/src/alpaka/TiltedGeometry.h @@ -9,11 +9,7 @@ #include #include -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" -#else -#include "Constants.h" -#endif namespace SDL { template diff --git a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h index 60cefedc751f9..57919d13705f8 100644 --- a/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h +++ b/RecoTracker/LSTCore/src/alpaka/TrackCandidate.h @@ -1,13 +1,8 @@ #ifndef TrackCandidate_cuh #define TrackCandidate_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "Triplet.h" #include "Segment.h" diff --git a/RecoTracker/LSTCore/src/alpaka/Triplet.h b/RecoTracker/LSTCore/src/alpaka/Triplet.h index 84fa04f77a4f0..1dfdbd5e9a900 100644 --- a/RecoTracker/LSTCore/src/alpaka/Triplet.h +++ b/RecoTracker/LSTCore/src/alpaka/Triplet.h @@ -1,13 +1,8 @@ #ifndef Triplet_cuh #define Triplet_cuh -#ifdef LST_IS_CMSSW_PACKAGE #include "RecoTracker/LSTCore/interface/alpaka/Constants.h" #include "RecoTracker/LSTCore/interface/alpaka/Module.h" -#else -#include "Constants.h" -#include "Module.h" -#endif #include "Segment.h" #include "MiniDoublet.h" diff --git a/RecoTracker/LSTCore/standalone/Makefile b/RecoTracker/LSTCore/standalone/Makefile index 5fe8f4c6dcfcd..4e8071b3e7a80 100644 --- a/RecoTracker/LSTCore/standalone/Makefile +++ b/RecoTracker/LSTCore/standalone/Makefile @@ -9,7 +9,7 @@ OBJECTS_ROCM=$(SOURCES:.cc=_rocm.o) OBJECTS=$(OBJECTS_CPU) $(OBJECTS_CUDA) $(OBJECTS_ROCM) CXX = g++ -CXXFLAGS = -g -O2 -Wall -fPIC -Wshadow -Woverloaded-virtual -Wno-unused-function -fno-var-tracking -std=c++17 -DLST_IS_CMSSW_PACKAGE +CXXFLAGS = -g -O2 -Wall -fPIC -Wshadow -Woverloaded-virtual -Wno-unused-function -fno-var-tracking -std=c++17 INCLUDEFLAGS= -ISDL -I$(shell pwd) -Icode -Icode/core -I${ALPAKA_ROOT}/include -I/${BOOST_ROOT}/include $(shell rooutil-config --include) -I$(shell root-config --incdir) -I${TRACKLOOPERDIR}/../../../ -I${CMSSW_BASE}/src -I../interface/alpaka/ -I../src/alpaka/ ifdef CMSSW_RELEASE_BASE INCLUDEFLAGS:= ${INCLUDEFLAGS} -I${CMSSW_RELEASE_BASE}/src diff --git a/RecoTracker/LSTCore/standalone/SDL/Makefile b/RecoTracker/LSTCore/standalone/SDL/Makefile index 6160ec6c80136..df2fbb6d9f8af 100644 --- a/RecoTracker/LSTCore/standalone/SDL/Makefile +++ b/RecoTracker/LSTCore/standalone/SDL/Makefile @@ -46,7 +46,7 @@ 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.. -CMSSWINCLUDE := -I${TRACKLOOPERDIR}/../../../ -I${CMSSW_BASE}/src -DLST_IS_CMSSW_PACKAGE +CMSSWINCLUDE := -I${TRACKLOOPERDIR}/../../../ -I${CMSSW_BASE}/src ifdef CMSSW_RELEASE_BASE CMSSWINCLUDE := ${CMSSWINCLUDE} -I${CMSSW_RELEASE_BASE}/src endif