Skip to content

GPU: three additional Metal adaptations #15835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ktf merged 1 commit into from
Sep 25, 2026
+5 −5
Merged

GPU: three additional Metal adaptations #15835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Common/MathUtils/include/MathUtils/SMatrixGPU.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ class SMatrixGPU
R mRep;
};

#if !defined(__OPENCL__) && !defined(__METAL__) // TODO: current C++ for OpenCL 2021 and MSL 4.1 are both at C++17, so no concepts. But we don't need this trick there anyway, so we can just hide it.
#if __cplusplus >= 202002L // the constraint below is a requires-clause; we do not need the trick where there are no concepts
template <class T, unsigned int D1, unsigned int D2, class R, typename Y, typename X = Y>
requires(sizeof(typename X::traits_type::pos_type) != 0) // do not provide a template to fair::Logger, etc... (pos_type is a member type of all std::ostream classes)
GPUd() X& operator<<(Y& y, const SMatrixGPU<T, D1, D2, R>&)
Expand Down
2 changes: 1 addition & 1 deletion GPU/Common/GPUCommonAlgorithm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class GPUCommonAlgorithm
GPUd() static void sortInBlock(T* begin, T* end, const S& comp);
template <class T, class S>
GPUd() static void sortDeviceDynamic(T* begin, T* end, const S& comp);
#ifndef __OPENCL__
#if __cplusplus >= 202002L // sortOnDevice takes an auto parameter
template <class T, class S>
GPUh() static void sortOnDevice(auto* rec, int32_t stream, T* begin, size_t N, const S& comp);
#endif
Expand Down
6 changes: 3 additions & 3 deletions GPU/GPUTracking/SectorTracker/GPUTPCTrackParam.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,10 +304,10 @@ GPUd() bool GPUTPCTrackParam::TransportToXWithMaterial(float x, GPUTPCTrackLinea
{
//* Transport the track parameters to X=x taking into account material budget

static constexpr float kRho = 1.025e-3f; // [g/cm^3]
static constexpr float kRadLen = 28811.7f; //[cm]
constexpr float kRho = 1.025e-3f; // [g/cm^3]
constexpr float kRadLen = 28811.7f; //[cm]

static constexpr float kRadLenInv = 1.f / kRadLen;
constexpr float kRadLenInv = 1.f / kRadLen;
float dl;

if (!TransportToX(x, t0, Bz, maxSinPhi, &dl)) {
Expand Down
Loading