Remove unnecessary GPUCA_GPUCODE protection in non-GPU code

Author: davidrohr

Common/Field/src/MagFieldFast.cxx

@@ -16,12 +16,10 @@
 #include "Field/MagFieldFast.h"
 #include <GPUCommonLogger.h>
 
-#ifndef GPUCA_GPUCODE_DEVICE
 #include <cmath>
 #include <fstream>
 #include <sstream>
 using namespace std;
-#endif
 
 using namespace o2::field;
 

Common/Utils/src/DebugStreamer.cxx

@@ -10,18 +10,16 @@
 // or submit itself to any jurisdiction.
 
 #include "CommonUtils/DebugStreamer.h"
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE)
 #include <thread>
 #include <fmt/format.h>
 #include "TROOT.h"
 #include "TKey.h"
 #include <random>
 #include "Framework/Logger.h"
-#endif
 
 O2ParamImpl(o2::utils::ParameterDebugStreamer);
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) && defined(DEBUG_STREAMER)
+#if defined(DEBUG_STREAMER)
 
 o2::utils::DebugStreamer::DebugStreamer()
 {

DataFormats/Detectors/TRD/src/Tracklet64.cxx

@@ -25,7 +25,6 @@ void Tracklet64::print() const
        HelperMethods::getSector(getDetector()), HelperMethods::getStack(getDetector()), HelperMethods::getLayer(getDetector()), getROB(), getMCM(), getPadRow(), getPadCol(), getPosition(), getSlope(), getPID(), getQ0(), getQ1(), getQ2(), getFormat());
 }
 
-#ifndef GPUCA_GPUCODE_DEVICE
 void Tracklet64::printStream(std::ostream& stream) const
 {
   stream << "Tracklet64 : 0x" << std::hex << getTrackletWord();
@@ -50,7 +49,5 @@ bool operator<(const Tracklet64& lhs, const Tracklet64& rhs)
          (lhs.getDetector() == rhs.getDetector() && lhs.getROB() == rhs.getROB() && lhs.getMCM() == rhs.getMCM() && lhs.getPadRow() == rhs.getPadRow() && lhs.getPadCol() < rhs.getPadCol());
 }
 
-#endif // GPUCA_GPUCODE_DEVICE
-
 } // namespace trd
 } // namespace o2

DataFormats/Reconstruction/src/DCA.cxx

@@ -20,20 +20,16 @@ namespace o2
 namespace dataformats
 {
 
-#ifndef GPUCA_GPUCODE_DEVICE
 std::ostream& operator<<(std::ostream& os, const o2::dataformats::DCA& d)
 {
   // stream itself
   os << "DCA YZ {" << d.getY() << ", " << d.getZ() << "} Cov {" << d.getSigmaY2() << ", " << d.getSigmaYZ() << ", " << d.getSigmaZ2() << "}";
   return os;
 }
-#endif
 
 void DCA::print() const
 {
-#ifndef GPUCA_GPUCODE_DEVICE
   std::cout << *this << '\n';
-#endif
 }
 
 } // namespace dataformats

DataFormats/Reconstruction/src/Vertex.cxx

@@ -20,8 +20,6 @@ namespace o2
 namespace dataformats
 {
 
-#ifndef GPUCA_GPUCODE_DEVICE
-#ifndef GPUCA_NO_FMT
 std::string VertexBase::asString() const
 {
   return fmt::format("Vtx {{{:+.4e},{:+.4e},{:+.4e}}} Cov.:{{{{{:.3e}..}},{{{:.3e},{:.3e}..}},{{{:.3e},{:.3e},{:.3e}}}}}",
@@ -39,7 +37,6 @@ void VertexBase::print() const
 {
   std::cout << *this << std::endl;
 }
-#endif
 
 bool VertexBase::operator==(const VertexBase& other) const
 {
@@ -54,8 +51,6 @@ bool VertexBase::operator==(const VertexBase& other) const
   return true;
 }
 
-#endif
-
 template class o2::dataformats::Vertex<o2::dataformats::TimeStamp<int>>;
 template class o2::dataformats::Vertex<o2::dataformats::TimeStampWithError<float, float>>;
 

Detectors/ITSMFT/ITS/tracking/src/Cluster.cxx

@@ -69,9 +69,7 @@ Cluster::Cluster(const int layerIndex, const float3& primaryVertex, const IndexT
 
 GPUhd() void Cluster::print() const
 {
-#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
   printf("Cluster: %f %f %f %f %f %d %d\n", xCoordinate, yCoordinate, zCoordinate, phi, radius, clusterId, indexTableBinIndex);
-#endif
 }
 
 TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float alpha, std::array<float, 2>&& posTF,
@@ -83,10 +81,8 @@ TrackingFrameInfo::TrackingFrameInfo(float x, float y, float z, float xTF, float
 
 GPUhd() void TrackingFrameInfo::print() const
 {
-#if !defined(GPUCA_GPUCODE_DEVICE) || (!defined(__OPENCL__) && defined(GPUCA_GPU_DEBUG_PRINT))
   printf("x: %f y: %f z: %f xTF: %f alphaTF: %f posTF: %f %f covTF: %f %f %f\n",
          xCoordinate, yCoordinate, zCoordinate, xTrackingFrame, alphaTrackingFrame,
          positionTrackingFrame[0], positionTrackingFrame[1],
          covarianceTrackingFrame[0], covarianceTrackingFrame[1], covarianceTrackingFrame[2]);
-#endif
 }

Detectors/TPC/calibration/src/CorrectionMapsOptions.cxx

@@ -16,8 +16,6 @@
 using namespace o2::tpc;
 using namespace o2::framework;
 
-#ifndef GPUCA_GPUCODE_DEVICE
-
 //________________________________________________________
 CorrectionMapsGloOpts CorrectionMapsOptions::parseGlobalOptions(const o2::framework::ConfigParamRegistry& opts)
 {
@@ -59,5 +57,3 @@ void CorrectionMapsOptions::addOption(std::vector<ConfigParamSpec>& options, Con
     options.emplace_back(osp);
   }
 }
-
-#endif // #ifndef GPUCA_GPUCODE_DEVICE

GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx

@@ -20,7 +20,7 @@
 
 using namespace o2::tpc;
 
-#if !defined(GPUCA_GPUCODE) && !defined(GPUCA_STANDALONE) // code invisible on GPU and in the standalone compilation
+#if !defined(GPUCA_STANDALONE) // code invisible on GPU and in the standalone compilation
 #include "NDPiecewisePolynomials.inc"
 void CalibdEdxTrackTopologyPol::dumpToTree(const uint32_t nSamplingPoints[/* Dim */], const char* outName) const
 {

GPU/GPUTracking/DataTypes/GPUTPCGMPolynomialField.cxx

@@ -15,8 +15,6 @@
 #include "GPUTPCGMPolynomialField.h"
 using namespace o2::gpu;
 
-#if !defined(GPUCA_GPUCODE)
-
 #include "GPUCommonConstants.h"
 #include <iostream>
 #include <iomanip>
@@ -129,12 +127,3 @@ void GPUTPCGMPolynomialField::Print() const
     }
   }
 }
-
-#else
-
-void GPUTPCGMPolynomialField::Print() const
-{
-  // do nothing
-}
-
-#endif

GPU/GPUTracking/Debug/GPUROOTDumpCore.cxx

@@ -14,7 +14,7 @@
 
 #include "GPUROOTDumpCore.h"
 
-#if (!defined(GPUCA_STANDALONE) || defined(GPUCA_BUILD_QA)) && !defined(GPUCA_GPUCODE)
+#if (!defined(GPUCA_STANDALONE) || defined(GPUCA_BUILD_QA))
 #include <atomic>
 #include <memory>
 #include <TFile.h>