From ee1e94e01523b57ea69c23ada152c6afd2487359 Mon Sep 17 00:00:00 2001 From: Andres Rios Tascon Date: Wed, 5 Jun 2024 09:32:32 -0400 Subject: [PATCH] Fixed standalone build --- RecoTracker/LSTCore/standalone/Makefile | 2 +- RecoTracker/LSTCore/standalone/SDL/Makefile | 2 +- RecoTracker/LSTCore/standalone/setup.sh | 4 ---- RecoTracker/LSTCore/standalone/setup_hpg.sh | 5 ----- 4 files changed, 2 insertions(+), 11 deletions(-) diff --git a/RecoTracker/LSTCore/standalone/Makefile b/RecoTracker/LSTCore/standalone/Makefile index 7e925dbf64f2d..5fe8f4c6dcfcd 100644 --- a/RecoTracker/LSTCore/standalone/Makefile +++ b/RecoTracker/LSTCore/standalone/Makefile @@ -10,7 +10,7 @@ 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 -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${CMSSW_BASE}/src -I../interface/alpaka/ -I../src/alpaka/ +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 endif diff --git a/RecoTracker/LSTCore/standalone/SDL/Makefile b/RecoTracker/LSTCore/standalone/SDL/Makefile index c50eaca859160..688e868d1b999 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${CMSSW_BASE}/src -DLST_IS_CMSSW_PACKAGE +CMSSWINCLUDE := -I${TRACKLOOPERDIR}/../../../ -I${CMSSW_BASE}/src -DLST_IS_CMSSW_PACKAGE ifdef CMSSW_RELEASE_BASE CMSSWINCLUDE := ${CMSSWINCLUDE} -I${CMSSW_RELEASE_BASE}/src endif diff --git a/RecoTracker/LSTCore/standalone/setup.sh b/RecoTracker/LSTCore/standalone/setup.sh index c92ef99a0f60f..1730e1b136b8b 100644 --- a/RecoTracker/LSTCore/standalone/setup.sh +++ b/RecoTracker/LSTCore/standalone/setup.sh @@ -55,7 +55,3 @@ fi export LATEST_CPU_BENCHMARK_EFF_MUONGUN="/data2/segmentlinking/muonGun_cpu_efficiencies.root" export LATEST_CPU_BENCHMARK_EFF_PU200="/data2/segmentlinking/pu200_cpu_efficiencies.root" #eof - -eval `scramv1 runtime -sh` -# this needs to be last because it gets overwritten by cmsenv -export LD_LIBRARY_PATH=$DIR/SDL:$DIR:$LD_LIBRARY_PATH diff --git a/RecoTracker/LSTCore/standalone/setup_hpg.sh b/RecoTracker/LSTCore/standalone/setup_hpg.sh index a4ca49595c543..8b2bd7f623407 100644 --- a/RecoTracker/LSTCore/standalone/setup_hpg.sh +++ b/RecoTracker/LSTCore/standalone/setup_hpg.sh @@ -47,8 +47,3 @@ export LSTPERFORMANCEWEBDIR=/home/users/phchang/public_html/LSTPerformanceWeb export LATEST_CPU_BENCHMARK_EFF_MUONGUN= export LATEST_CPU_BENCHMARK_EFF_PU200= #eof - -eval `scramv1 runtime -sh` -# this needs to be last because it gets overwritten by cmsenv -export LD_LIBRARY_PATH=$DIR/SDL:$DIR:$LD_LIBRARY_PATH -