Skip to content

feat: Minor tweaks to Spline CI #231

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
KSkwarczynski merged 1 commit into from
Mar 19, 2026
Merged

feat: Minor tweaks to Spline CI #231

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
23 changes: 20 additions & 3 deletions CIValidations/SplineValidations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,21 @@
#include "Utils/Comparison.h"
#include "SplinesTutorial/BinnedSplinesTutorial.h"

void CleanSpline(std::vector< std::vector<TResponseFunction_red*> >& MasterSpline ) {
// Delete all the TSpline3 memory allocated since this now lives on the GPU and is no longer needed on the GPU
for(unsigned int i = 0; i < MasterSpline.size(); ++i)
{
for(unsigned int j = 0; j < MasterSpline[i].size(); ++j)
{
if(MasterSpline[i][j] != nullptr) delete MasterSpline[i][j];
}
MasterSpline[i].clear();
MasterSpline[i].shrink_to_fit();
}
MasterSpline.clear();
MasterSpline.shrink_to_fit();
}

void SplineMonolithValidations(std::ostream& outFile) {
MACH3LOG_INFO("Testing Spline Monolith");
std::string TutorialPath = std::getenv("MaCh3Tutorial_ROOT");
Expand All @@ -15,7 +30,7 @@ void SplineMonolithValidations(std::ostream& outFile) {
std::vector<RespFuncType> SplineType = {kTSpline3_red, kTSpline3_red, kTSpline3_red, kTSpline3_red};
const unsigned int Nevents = MasterSpline.size();
auto Splines = std::make_unique<SMonolith>(MasterSpline, SplineType, true);

CleanSpline(MasterSpline);
std::vector< const double* > splineParsPointer(Dials.size());
for (unsigned int i = 0; i < Dials.size(); ++i) {
splineParsPointer[i] = &Dial_Values[i];
Expand All @@ -28,7 +43,8 @@ void SplineMonolithValidations(std::ostream& outFile) {
Splines->SynchroniseMemTransfer();

for(unsigned int i = 0; i < Nevents; i++) {
outFile << "Event " << i << " weight = " << Splines->cpu_total_weights[i] << std::endl;
const auto* weightPtr = Splines->retPointer(i);
outFile << "Event " << i << " weight = " << *weightPtr << std::endl;
}

////// Testing Pre Computed Spline
Expand All @@ -45,7 +61,8 @@ void SplineMonolithValidations(std::ostream& outFile) {
//KS: If using CPU this does nothing, if on GPU need to make sure we finished copying memory from
SplinesFlat->SynchroniseMemTransfer();
for(unsigned int i = 0; i < Nevents; i++) {
outFile << "(Flat) Event " << i << " weight = " << SplinesFlat->cpu_total_weights[i] << std::endl;
const auto* weightPtr = SplinesFlat->retPointer(i);
outFile << "(Flat) Event " << i << " weight = " << *weightPtr << std::endl;
}
}

Expand Down
1 change: 0 additions & 1 deletion Utils/SplineMonoUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ std::vector< std::vector<TResponseFunction_red*> > GetMasterSpline(
for(unsigned int i = 0; i < DialNames.size(); ++i) {
std::string str = DialNames[i];
const char *cstr = str.c_str();
//std::cout<< "cstr = "<< cstr <<std::endl;
chain->SetBranchStatus(cstr, true);
chain->SetBranchAddress(cstr, &(grapharrays[i]));
}// End the for loop over the unique spline parameters
Expand Down