Skip to content
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.

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

Add LST and LSTCore #30

Merged
merged 2 commits into from
Nov 25, 2024
Merged

Conversation

ariostas
Copy link
Member

Here's a draft of the LSTCore package, but now using real files. Here are some notes about it.

  • The data directory is temporary and should be removed before we submit the PR to the main CMSSW repo. We should get started populating RecoTracker-LSTCore.
  • I added a standalone directory, following Slava's suggestion. I adapted the scripts so that you can compile and run as before. One important thing to note is that you need to run setup.sh right before compiling/running (we can make it more seamless later).
  • I made the LSTCore commit be co-authored by all contributors to TrackLooper so that we all can get some credit once it goes into CMSSW.

I tested running both standalone and CMSSW, and everything seems fine.

@ariostas
Copy link
Member Author

This is a replacement of #29. This is still a draft since it includes all the data files, which should be removed. There's also many files that were added just for the standalone part, and I'm not sure if that's fine.

@VourMa
Copy link
Collaborator

VourMa commented May 29, 2024

Will check it out tonight and maybe test it and report back. Thanks!

@slava77
Copy link

slava77 commented May 29, 2024

The data directory is temporary and should be removed before we submit the PR to the main CMSSW repo. We should get started populating RecoTracker-LSTCore.

these will likely trigger an issue of increasing the git repo by too much and will need to be removed from the git history.

Is it a matter of getting CI to know where to take the data files?
We could already populate the master in a fork of cms-data in https://github.com/SegmentLinking/RecoTracker-LSTCore and just have the CI do git clone https://github.com/SegmentLinking/RecoTracker-LSTCore.git $CMSSW_BASE/src/RecoTracker/LSTCore/data

@ariostas ariostas force-pushed the CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles branch 2 times, most recently from f173c6b to 8ced0f1 Compare May 29, 2024 18:41
@ariostas
Copy link
Member Author

these will likely trigger an issue of increasing the git repo by too much and will need to be removed from the git history.

Yeah, I removed them from the git history

Is it a matter of getting CI to know where to take the data files?

Yeah, I'll do that. Thanks!

Copy link
Collaborator

@VourMa VourMa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I foresee a comment at the review about the many commits with "invalid states", e.g. when the LST was included as an external package, something that was/will never be useful for CMSSW. Based on this, shall we squash the commits? Maybe two commits would make sense, the one that Added LSTCore and one with the rest of the commits in the cmssw repo.

RecoTracker/FinalTrackSelectors/plugins/TrackListMerger.cc Outdated Show resolved Hide resolved
RecoTracker/LST/src/alpaka/ES_ModulesDev.cc Outdated Show resolved Hide resolved
RecoTracker/LST/test/LSTAlpakaTester.py Outdated Show resolved Hide resolved
RecoTracker/LST/test/LSTInputTester.py Outdated Show resolved Hide resolved
RecoTracker/LSTCore/README.md Outdated Show resolved Hide resolved
RecoTracker/LSTCore/interface/alpaka/Constants.h Outdated Show resolved Hide resolved
RecoTracker/LSTCore/src/alpaka/Triplet.h Outdated Show resolved Hide resolved
else
export SCRAM_ARCH=el8_amd64_gcc12
fi
export CMSSW_VERSION=CMSSW_14_1_0_pre3
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this ok if we leave it like that? Maybe we should just grab the version of CMSSW we have set up?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a standalone setup, somewhat tuned to available input file formats and other dependencies (like a test file format).

Also, aren't the following lines (from cmsrel) implying that the version is not known otherwise?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should have a better setup script. I only made the minimal modifications to get it to work.

@VourMa
Copy link
Collaborator

VourMa commented May 30, 2024

I also tried the standalone version within CMSSW. It compiles fine but it doesn't run because:

ERROR: Could not find the file = "/home/users/evourlio/LSTinCMSSW/movingFullyToCMSSW/CMSSW_14_1_0_pre3/src/RecoTracker/LSTCore/standalone/..//data/OT800_IT615_pt0.8/endcap_orientation.bin"

I guess this is because data files were removed from the history. Are there changes pending for things to work? Or is there some manual intervention required, like I need to clone the data files with an extra command? I see that this is still empty, so I can just push the data folder structure there? I noticed that Andres has already created an initial branch there, that is filled with data.

@slava77
Copy link

slava77 commented May 30, 2024

I also tried the standalone version within CMSSW. ...

we should probably decide what "standalone" would actually mean:

  • a setup that can compile and run sdl_cuda and such while also being able to run a cmsRun
  • or something more "restrictive" (with lower dependency stack) using a sparse checkout where only the libsdl_* and sdl_* bins are compiled and can run.

I guess this is because data files were removed from the history. Are there changes pending for things to work?

That's a bit related to the above:

  • if the standalone will operate inside CMSSW, we can default to what will be visible in $CMSSW_RELEASE_BASE/external/el8_amd64_gcc12/data/RecoTracker/LSTCore/data
  • or assume some local checkout path; in this case the LST_BASE environment will need to be set

@slava77
Copy link

slava77 commented May 30, 2024

  • we can default to what will be visible in $CMSSW_RELEASE_BASE/external/el8_amd64_gcc12/data/RecoTracker/LSTCore/data

and if that path is not available, to add a git clone/checkout from https://github.com/SegmentLinking/RecoTracker-LSTCore

@VourMa
Copy link
Collaborator

VourMa commented May 31, 2024

we should probably decide what "standalone" would actually mean:

  • a setup that can compile and run sdl_cuda and such while also being able to run a cmsRun
  • or something more "restrictive" (with lower dependency stack) using a sparse checkout where only the libsdl_* and sdl_* bins are compiled and can run.

In principle both can work with small changes to the current state of the code, I believe.

For the first case, all we need is to modify:

std::string trackLooperDir() {
const char* path_lst_base = std::getenv("LST_BASE");
const char* path_tracklooperdir = std::getenv("TRACKLOOPERDIR");
std::string path_str;
if (path_lst_base != nullptr) {
path_str = path_lst_base;
} else if (path_tracklooperdir != nullptr) {
path_str = path_tracklooperdir;
path_str += "/../";
} else {
// FIXME: temporary solution, will need to pass a value from FileInPath or CMSSW search path
// in the `LSTProducer` or a related ES producer
path_str = std::getenv("CMSSW_BASE");
path_str += "/src/RecoTracker/LSTCore";
}
return path_str;
}

to point to a different directory according to your comment:

and if that path is not available, to add a git clone/checkout from https://github.com/SegmentLinking/RecoTracker-LSTCore

For the second case, I did:

git clone --filter=blob:none --no-checkout --depth 1 --sparse --branch CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles https://github.com/SegmentLinking/cmssw.git
cd cmssw/
git sparse-checkout add HeterogeneousCore/AlpakaInterface RecoTracker/LSTCore
git checkout

Given the absence of the $CMSSW_RELEASE_BASE/external/el8_amd64_gcc12/data/RecoTracker/LSTCore/data directory, I did:

cd RecoTracker/LSTCore
git clone [email protected]:SegmentLinking/RecoTracker-LSTCore.git data
cd data
git fetch origin initial
git checkout initial
cd ../../..

Then, the include directories are a bit off, because there is no proper $CMSSW_BASE. I fixed this by including -I../../.. or -I../../../.. in the Makefile and SDL/Makefile respectively. Doing so, I managed to run everything.
Of course, this was a "hack" at this stage. The proper solution to me would be to add a compilation flag to disable the LST_IS_CMSSW_PACKAGE flag, and change lines like:

#else
#include "Constants.h"
#include "Module.h"
#endif

to point to the appropriate directories, as these lines are useless right now, if also the standalone is in CMSSW.

UPDATE:

As of 6025567, the fix of the Makefiles has been applied, so the standalone package can be used without manual interventions.

@@ -0,0 +1,157 @@
#ifndef Constants_cuh
#define Constants_cuh
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

will need compliant header guards; not sure it's an ovekill to do them with #ifdef LST_IS_CMSSW_PACKAGE;
otherwise

Suggested change
#define Constants_cuh
#define RecoTracker_LSTCore_alpaka_Constants_cuh

@@ -0,0 +1,7007 @@
#include "trktree.h"
trktree trk;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this auto-generated?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sgnoohc Perhaps you know/remember?

RecoTracker/LST/test/LSTAlpakaTester.py Outdated Show resolved Hide resolved
RecoTracker/LSTCore/interface/alpaka/Constants.h Outdated Show resolved Hide resolved
else
export SCRAM_ARCH=el8_amd64_gcc12
fi
export CMSSW_VERSION=CMSSW_14_1_0_pre3
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's a standalone setup, somewhat tuned to available input file formats and other dependencies (like a test file format).

Also, aren't the following lines (from cmsrel) implying that the version is not known otherwise?

float drt_InSeg = rtMid - rtIn;
float dz_InSeg = zMid - zIn;
float dr3_InSeg =
alpaka::math::sqrt(acc, rtMid * rtMid + zMid * zMid) - alpaka::math::sqrt(acc, rtIn * rtIn + zIn + zIn);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

todo: pick up the update from SegmentLinking/TrackLooper#407

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in #44.

@ariostas
Copy link
Member Author

I foresee a comment at the review about the many commits with "invalid states"

Yeah, I think it makes sense to squash commits further. Let's also resolve all the discussions here by adding more commits to this branch and once it's in good shape we'll squash everything into 1-2 commits.

@ariostas
Copy link
Member Author

Here's a new branch with squashed commits. I can change the branch name and/or commit messages if you prefer.

https://github.com/SegmentLinking/cmssw/tree/LST_and_LSTCore

@VourMa
Copy link
Collaborator

VourMa commented May 31, 2024

Here's a new branch with squashed commits. I can change the branch name and/or commit messages if you prefer.

https://github.com/SegmentLinking/cmssw/tree/LST_and_LSTCore

Seems good to me. Should we force-push those commits in this branch, so that we can keep track of the discussions that we have already started here?

@ariostas
Copy link
Member Author

Should we force-push those commits in this branch, so that we can keep track of the discussions that we have already started here?

Yeah, sounds good. I wasn't sure about that so I made a separate one to be safe, but let's just stick with this branch for discussions.

@ariostas ariostas force-pushed the CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles branch from 83cc530 to 891eb11 Compare May 31, 2024 18:41
@ariostas
Copy link
Member Author

There are lots of changes after the force-push, but that's just because I re-synced with upstream master.

@slava77
Copy link

slava77 commented May 31, 2024

There are lots of changes after the force-push, but that's just because I re-synced with upstream master.

the actual diffs in the https://github.com/SegmentLinking/cmssw/pull/30/files look OK.

@ariostas
Copy link
Member Author

Should we close this PR now? It seems like it's no longer needed for discussions.

@VourMa
Copy link
Collaborator

VourMa commented Jun 13, 2024

Should we close this PR now? It seems like it's no longer needed for discussions.

I think that the point of this PR is to mirror the ones in CMSSW master, so that when the central one is merged, this is also merged automatically. At least that's what I had understood based on the mkFit model of development.

@slava77
Copy link

slava77 commented Jun 13, 2024

I think that the point of this PR is to mirror the ones in CMSSW master, so that when the central one is merged, this is also merged automatically. At least that's what I had understood based on the mkFit model of development.

yes, that's the idea.
In addition, it's a convenient place to have aside discussion about changes there.

Also, being able to run our CI here would also be helpful; although the comparisons would have to be with an earlier version of itself; so, perhaps more complicated. Would it be possible to at least run the linter part?

@VourMa
Copy link
Collaborator

VourMa commented Jun 28, 2024

Should I sync the SegmentLinking/cmssw master to the cms-sw/cmssw master? I guess that would allow us to see the conflicts also here?

Comment on lines 1361 to 1367
const float sdlThetaMulsF = 0.015f * alpaka::math::sqrt(acc, 0.1f + 0.2f * (rt_OutLo - rt_InUp) / 50.f) *
alpaka::math::sqrt(acc, r3_InUp / rt_InUp);
const float sdlMuls = sdlThetaMulsF * 3.f / ptCut * 4.f; // will need a better guess than x4?

float dzErr = drt_OutLo_InUp * etaErr * coshEta; //FIXME: check with the calc in the endcap
dzErr *= dzErr;
dzErr += 0.03f * 0.03f; // pixel size x2. ... random for now
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we know what this 0.015 is? It seems to be the double of the pixel size? However, it doesn't correspond to the numbers that @YonsiG had sent:

For 2S module, the stripe is 5cm * 90 μm.
For PS module pixel, 1.5mm * 100 μm.
For PS module stripe, 2.4cm * 100 μm.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the number is related to the 1.5mm of pixel module size. And later, it says 0.03 is pixel size times 2 in the comments of L1367. However, unfortunately I'm not sure how this variable is scaled to 0.015..

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this part is from my old code;
this is referring to the IT pixel size here. The PS "P" side is in zGeom below

#include <cuda_fp16.h>
#endif

namespace SDL {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I read in the CMSSW coding rules that namespaces should use lowercase.
@slava77 Is this acceptable or should I start changing this preemptively?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would not change now

}

pass = pass && (alpaka::math::abs(acc, dPhiChange) < miniCut);
noShiftedDz = 0; // not used anywhere
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Staying true to the inline comment, this variable is not used anywhere. Should I remove it from the code? Any clue by anyone if this will potentially fulfill a purpose and should be kept in? Maybe @slava77 has an idea why/how this was used in the past?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The purpose is in the name: variables without shifting
// The main feature of this shifting is that the strip hits are shifted to be "aligned" in the line of sight from interaction point to the the pixel hit.

It seems OK to remove

Comment on lines 1827 to 1828
#ifndef PixelQuintuplet_cuh
#define PixelQuintuplet_cuh
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comments from Matti:

Should the code hereafter be in a separate file?

Maybe @slava77, do you remember why PixelTriplets and PixelQuintuplets were merged? I think it must have been because of the suggestions we got from a hackathon? Shall we just remove these lines and rename the folder to be more descriptive of what it contains?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we ok with a rename and removal of lines that makes this look like a separate file?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it would be good to recall why/if the register gains are happening.
Naively, one or two header files should give the same result

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems like calling functions from the same file reduced registers wrt. the case where functions are called from separate files. For pT5s, it is common to call functions that are for pT3s, like

if (not runPixelTripletDefaultAlgo(acc,
hence the files were joined - but in crude way, just copying PixelQuintuplets.h into PixelTriplets.h...
I don't know the lower level details for this behavior...

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

back then we had .cu files and PixelQuintuplets were in a separate .cu. So, a merge was clearly practical. The headers may even have stayed separate.

Now we compile everything (relevant for this split) in a combined Event.dev.cc.
So, I think that re-split of the .h should be OK

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, let's put that in the queue of updates.

// =================================================================

unsigned int iL = modulesInGPU.layers[moduleIndex] - 1;
const float miniSlope = alpaka::math::asin(acc, alpaka::math::min(acc, rt * k2Rinv1GeVf / ptCut, sinAlphaMax));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am working on removing the ALPAKA_STATIC_ACC_MEM_GLOBAL keyword from our Constants.h file. When I remove it from in front of sinAlphaMax, I get:

src/RecoTracker/LSTCore/src/alpaka/MiniDoublet.h(358): error: identifier "lst::sinAlphaMax" is undefined in device code

However, if I do:

Suggested change
const float miniSlope = alpaka::math::asin(acc, alpaka::math::min(acc, rt * k2Rinv1GeVf / ptCut, sinAlphaMax));
const float miniSlope = alpaka::math::asin(acc, alpaka::math::min(acc, rt * k2Rinv1GeVf / ptCut, 1.f * sinAlphaMax));

it compiles just fine. Any idea what is going on? If not, I can propagate the comment to the CMSSW PR.

The same happens with other variables.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The function expects a reference (T const&) in the arguments.
In the example above with 1.f* the compiler generates a temporary first, which works.
But when you use it directly, the constexpr (without static specifiers) has no address.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see, it makes sense. How should we handle it then? Should I just keep the ALPAKA_STATIC_ACC_MEM_GLOBAL for the constants that we use "alone" or create temporaries for those and get rid of the keyword to have a consistent treatment for the constants?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to be a guideline topic; better ask Matti.

Comment on lines 41 to 48
std::vector<unsigned int> ph2_detId;
std::vector<float> ph2_x;
std::vector<float> ph2_y;
std::vector<float> ph2_z;
std::vector<TrackingRecHit const*> ph2_hits;
Copy link
Collaborator

@VourMa VourMa Jul 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Comment from Andrea:

I would suggest to pre-compute the final size and reserve() the vectors to avoid the multiple reallocations.

Do you see any easy way to precompute this? I understand that these vectors should be of size phase2OTHits.size() * it->size(), Σ_i (it->size())_i, where the sum is over all of the phase2OTHits elements, and that this is very much dependent on the occupancy of the tracker per event, which can vary by a lot. Printing out the numbers for 10 events:

phase2OTHits.size()
max(it->size())

2093
18

1625
25

2772
17

2077
24

1390
14

1867
28

2967
21

3667
22

3001
46

4158
18

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be just a simple ph2_hits.reserve(phase2OTHits.size());

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about this some more, I was wrong in the calculation of the size of the vectors. I corrected the calculation in the original comment above, and from that it follows that ph2_hits.size() >= phase2OTHits.size(). Running again for 10 events:

ph2_hits.size()

3243

2429

3811

2756

2043

2872

3839

5379

4424

5922

But are you saying that having the estimate ph2_hits.reserve(phase2OTHits.size()); is good enough, so I should just implement that?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I should've checked the interface; it should be ph2_hits.reserve(phase2OTHits.dataSize());

// Initialize variables outside of the for loop.
int occupancy, category_number, eta_number;

for (uint16_t i = globalThreadIdx[2]; i < *modulesInGPU.nLowerModules; i += gridThreadExtent[2]) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/cms-sw/cmssw/pull/45117/files#r1681618028 and related comment suggest some assurance is needed that this is effectively a 1D (and more importantly, a single block) kernel.
Should the kernel be rewritten to Acc1D?

Comment on lines 12 to 14
#ifdef ALPAKA_ACC_GPU_CUDA_ENABLED
#include <cuda_fp16.h>
#endif
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

following https://github.com/cms-sw/cmssw/pull/45117/files#r1682937131 and cms-sw#45117 (comment)
should this have a comment about non-existent FP16 support and also condition this ifdef on #if defined(FP16_Base)

@slava77
Copy link

slava77 commented Jul 27, 2024

I've resynced our master fork to show another conflict in Configuration/PyReleaseValidation/python/relval_2026.py

# Parsing command-line opts
while getopts ":cxgsmdp3NCGRA2ehwP:" OPTION; do
case $OPTION in
c) MAKECACHE=true;;
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it looks like options are not consistent with the help anymore

seedIdx_(std::move(seedIdx)),
trackCandidateType_(std::move(trackCandidateType)) {}

enum LSTTCType { T5 = 4, pT3 = 5, pT5 = 7, pLS = 8 };
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@VourMa
this is now the same as LSTObjType.
Is there a good reason to duplicate?

RecoTracker/LSTCore/interface/Common.h seems more authoritative than this location

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I initially thought that the LSTObjType would include more types (not only those included in TCs) but it turns out that it doesn't. However, LSTOutput.h is a CMSSW-only module, and I am not sure we want it to have interface with LSTCore-only header files -the only way they interface till now is through the LST class If it's ok to "export" an additional dependency from the LSTCore package, then we could remove this indeed.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm mainly concerned about expanding standalone being dependent on more of CMSSW packages.

I'm not sure about cases where dependency of CMSSW-specific LST or even remotely LST package on LSTCore/interface can be a problem.
Do you have some hypothetical examples?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, I don't have any specific example. I can give a try to switching to the enum in Common.h while resolving conflicts.


from RecoTracker.LST.lstModulesDevESProducer_cfi import lstModulesDevESProducer

# not scheduled task to get the framework to hide the producer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@slava77 Not sure whether you intended to add anything more in your #115 PR, but, if you do, could you also remove this comment? I forgot to do it while updating this file.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I started picking up other stuff at first, but then made a long-range change and reverted back to just a technically required change.
So, I didn't really intend to, but I can, if you prefer.

We still need an update in python files elsewhere to resolve the conflicts; could be added there.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, I noticed the conflicts only afterwards, and it can be added there. Let me give that a try now.

@slava77
Copy link

slava77 commented Nov 13, 2024

I was looking at the git history trying to see the feasibility of rebase: the full diff now is 036340d...CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles; files in non-{LST,LSTCore} packages are modified in the following commits, in their time order from the oldest (including a list of packages)

  • 7bc53be (May 31) Configuration, RecoTracker/{ConversionSeedGenerators,FinalTrackSelectors,IterativeTracking,LST}
  • 7c6bcfa Configuration
  • 85682e8 RecoTracker/{IterativeTracking,LST}
  • ef48f74 Configuration
  • 149c628 Configuration
  • ae67290 Configuration
  • a22faeb RecoTracker/FinalTrackSelectors
  • 5b1e21c Configuration
  • 476d3aa batch8 Configuration, RecoTracker/{IterativeTracking,LST,LSTCore} ... this will sweep everything
  • 8928adf (Nov 7) Configuration

IIUC, a clear squash in Configuration would need a squash starting from the first commit grouped all the way down to the most recent; at least the part through batch8 would need to go like that due to relval_2026.py renaming that happened only by batch8. Consequently, it would require squashing of everything in between. A more useful path is to split the above commits if they touch multiple packages and then go back and squash accordingly.

This still seems like too much effort to preserve updates related to the review of the code and not so much to most of the historical features that entered as a single commit in the beginning.

@slava77
Copy link

slava77 commented Nov 13, 2024

A more useful path is to split the above commits if they touch multiple packages and then go back and squash accordingly.

uhm, but then this will just make non-functional commit states: the code will not run in the earlier commits.

@ariostas
Copy link
Member Author

I've been trying a few options. The rebase with --rebase-merges is the opposite of what we want. But doing the normal rebase we'll have to resolve conflicts again. Given that so many things changed in between, I think it's better to just squash everything down to a single commit.

@slava77
Copy link

slava77 commented Nov 13, 2024

I've been trying a few options. The rebase with --rebase-merges is the opposite of what we want. But doing the normal rebase we'll have to resolve conflicts again. Given that so many things changed in between, I think it's better to just squash everything down to a single commit.

I agree with one commit

@VourMa
Copy link
Collaborator

VourMa commented Nov 13, 2024

I've been trying a few options. The rebase with --rebase-merges is the opposite of what we want. But doing the normal rebase we'll have to resolve conflicts again. Given that so many things changed in between, I think it's better to just squash everything down to a single commit.

I agree with one commit

+1

@ariostas
Copy link
Member Author

What's your opinion on force-pushing vs new PR? I'm fine with either.

@slava77
Copy link

slava77 commented Nov 13, 2024

What's your opinion on force-pushing vs new PR? I'm fine with either.

with a force push you can still see the diffs.
I was thinking of making a copy branch for ourselves (can be mentioned in the PR as well) for the state right before the force-push

@ariostas
Copy link
Member Author

I was thinking of making a copy branch for ourselves (can be mentioned in the PR as well) for the state right before the force-push

Sounds good. I had made _realfiles_backup just in case, but maybe we can use a better name like _45117_final or something

@slava77
Copy link

slava77 commented Nov 13, 2024

like _45117_final

sounds good to me

Squashed commit of the following:

commit c21a481
Author: Slava Krutelyov <[email protected]>
Date:   Tue Nov 12 11:04:49 2024 -0800

    batch9 of updates for LST integration in CMSSW (#121)

    * FP16_Base compilation fixes
    * Delete obsolete comment
    * Remove duplicate enum
    * Remove unused arrays and functions
    * correct return type
    * Removed unnecessary CopyToDevice
    * Small fixes to address review comments
    * Simplify moving to common enum
    ---------

    Co-authored-by: Slava Krutelyov <[email protected]>
    Co-authored-by: Manos Vourliotis <[email protected]>
    Co-authored-by: Andres Rios Tascon <[email protected]>

commit 1a0ab7e
Merge: 8928adf 036340d
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Nov 12 10:21:39 2024 -0800

    Merge tag 'CMSSW_14_2_X_2024-11-11-2300' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit 8928adf
Author: Manos Vourliotis <[email protected]>
Date:   Thu Nov 7 05:30:25 2024 -0800

    Update LST workflows to use Run4 instead of 2026

commit bedeb45
Merge: 12ead85 476d3aa
Author: Manos Vourliotis <[email protected]>
Date:   Wed Nov 6 21:30:25 2024 -0800

    Merge remote-tracking branch 'SegLink/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_142X-11-06-1100

commit 476d3aa
Author: Slava Krutelyov <[email protected]>
Date:   Mon Nov 4 06:02:24 2024 -0800

    batch8 of updates for LST integration in CMSSW (#113)

    * Removed allocBufWrapper and cache toggle
    * Removed references to temporaries
    * Fixed headers
    * Removed devAcc_
    * Simplified view creation
    * File and class renaming
    * Update workflow, enums, compilation flags
    * Move LSTOutputConverter to edm::stream::EDProducer
    * Merge standalone and CMSSW functions to get hits and TCs
    * Updates to remove syncs when creating or destroying the LSTEvent in CMSSW
    * Rename lst_INF and finalize simplification of compilation flags
    * Create lstProducerTask, move to C++20 pi and use C++20 in standalone compilation
    * Include numbers
    * Limit number of make threads

    ---------

    Co-authored-by: Andres Rios Tascon <[email protected]>
    Co-authored-by: Manos Vourliotis <[email protected]>

commit 4d603ca
Merge: 04d02b4 b96fd02
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 29 11:57:22 2024 -0700

    Merge tag 'CMSSW_14_2_0_pre3' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit 04d02b4
Merge: 83897c8 cb1557e
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 29 05:49:09 2024 -0700

    Merge pull request #109 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7

    migrate to SoATemplate

commit cb1557e
Merge: 83897c8 f8e7884
Author: Slava Krutelyov <[email protected]>
Date:   Mon Oct 28 15:06:13 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit f8e7884
Merge: ccc4bf4 48d01f3
Author: Slava Krutelyov <[email protected]>
Date:   Mon Oct 28 14:35:23 2024 -0700

    Merge pull request #106 from SegmentLinking/more_soa_migrations

    continuing migration to SoA: update LS, migrate ranges, hits, endcap, modules

commit 48d01f3
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Oct 28 11:37:42 2024 -0700

    Review fixes

commit d08032a
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 13:14:50 2024 -0700

    Consistency fixes

commit 891a97d
Merge: 043dfe0 ccc4bf4
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 12:34:18 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into more_soa_migrations

commit 043dfe0
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 11:35:59 2024 -0700

    migrate modules to SoATemplate

commit ccc4bf4
Merge: cb84b9c 00013dd
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 25 14:29:22 2024 -0400

    Merge pull request #104 from slava77/CMSSW_14_2_0_pre1/LSTb7-SoA-TC-T5

    continuing migration to SoA: upd TC, migrate T3s, T5s, pT3s and pT5s ...

commit 00013dd
Author: Slava Krutelyov <[email protected]>
Date:   Thu Oct 24 12:02:14 2024 -0700

    migrate pT3 and pT5 to SoATemplate

commit 5e2bf7b
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 24 11:22:00 2024 -0700

    migrate EndcapGeometry to SoATemplate

commit 018204d
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 24 11:18:59 2024 -0700

    migrate hits to SoATemplate

commit 534ac1b
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 24 11:00:55 2024 -0700

    migrate ranges to SoATemplate

commit 9b8d26d
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 22 16:11:02 2024 -0700

    migrate quintuplets to SoATemplate

commit fd99b50
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 22 08:35:15 2024 -0700

    Made view sizes clearer

commit 1bbe663
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 22 06:52:37 2024 -0700

    migrate triplets to SoATemplate

commit 6f1ea3f
Author: Slava Krutelyov <[email protected]>
Date:   Thu Oct 10 10:55:17 2024 -0700

    simplify a bit TC SoAs

commit cb84b9c
Merge: fc3fc6a 0e0b5e1
Author: Slava Krutelyov <[email protected]>
Date:   Fri Oct 18 07:26:37 2024 -0700

    Merge pull request #93 from SegmentLinking/segments_soa

    Migrate segments to SoA+PortableCollection

commit 0e0b5e1
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Oct 16 08:22:33 2024 -0700

    Match conventions from previous PRs

commit 6b37c07
Merge: efef777 fc3fc6a
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Oct 16 08:04:42 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into segments_soa

commit fc3fc6a
Merge: 8338254 d3156d1
Author: Slava Krutelyov <[email protected]>
Date:   Wed Oct 16 05:04:48 2024 -0700

    Merge pull request #101 from SegmentLinking/mds_soa

    Migrate MDs to SoA+PortableCollection

commit d3156d1
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 15 20:11:11 2024 -0700

    Fixed formatting

commit 36a8c43
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Oct 14 13:51:19 2024 -0700

    Moved MiniDoubletsDeviceCollection definition

commit 3b4fa9e
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 13:22:05 2024 -0700

    Made view sizes clearer

commit 66612e8
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 12:48:15 2024 -0700

    Moved MD SoA definition to its own header

commit 129a2d4
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 07:02:06 2024 -0700

    Adjusted naming convention

commit 8fba6cb
Merge: f430d1b 8338254
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Oct 10 06:48:51 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7' into mds_soa

commit 8338254
Merge: 3858cf3 69804f0
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 8 14:11:10 2024 -0400

    Merge pull request #90 from slava77/CMSSW_14_1_0_pre5/LSTb6-SoA-TCs

    migrate TrackCandidate to use SoATemplate and PortableCollection

commit 69804f0
Author: Slava Krutelyov <[email protected]>
Date:   Fri Oct 4 16:04:19 2024 -0700

    move TrackCandidatesDeviceCollection and related aliases to interface/alpaka

commit f430d1b
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 4 06:37:25 2024 -0700

    Formatted and removed unnecessary CopyToHost

commit efef777
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Oct 4 06:21:52 2024 -0700

    Removed unnecessary CopyToHost

commit a296da7
Author: Slava Krutelyov <[email protected]>
Date:   Tue Oct 1 15:46:02 2024 -0700

    get rid of TrackCandidates* trackCandidatesD_ and simplify syntax

commit 52377d1
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Oct 1 08:33:37 2024 -0400

    Fixed makefile

commit 20f6f9c
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 30 17:11:03 2024 -0400

    Migrated MDs to SoA+PortableCollection

commit 155fc82
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 09:50:08 2024 -0700

    switch to TrackCandidates = ::lst::TrackCandidatesSoA::View

commit af1f68f
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 07:46:09 2024 -0700

    code checks

commit 8864fd1
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 07:42:03 2024 -0700

    sync DALPAKA flags in standalone builds with cmsdist scram-tools.file/tools/alpaka/alpaka.xml

commit a5822d0
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 29 07:41:06 2024 -0700

    add a check that device and host match for host=device

commit 3e98eb4
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 20:49:20 2024 -0700

    code checks

commit 18a1f6e
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 17:18:14 2024 -0700

    drop -Wshadow in standalone builds: DataFormats/SoATemplate and related generates around 30MB of warnings with only partial TrackCandidate SoA use

commit 94df11b
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 17:16:08 2024 -0700

    migrate TrackCandidate to SoA from DataFormats/SoATemplate: kernels internally are still using the POD TrackCandidates SoA (to be migrated later)

commit 96be4f7
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Sep 25 10:29:07 2024 -0700

    Initialize only required columns

commit 3858cf3
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 12:26:35 2024 -0700

    Fixed cxxopts compilation

commit 9e2a402
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 12:01:31 2024 -0700

    Format code

commit 77ff0e5
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 11:59:41 2024 -0700

    Fixed memset

commit 37fe122
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 23 11:44:35 2024 -0700

    Fixed indexing issues

commit acff43f
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Sep 20 08:30:54 2024 -0700

    Switched to only using views

commit a7e3ec3
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Sep 18 13:43:33 2024 -0700

    Fixed standalone compilation

commit d5da756
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Sep 18 12:44:07 2024 -0700

    Moved segments to SoA+PortableCollection

commit 83897c8
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 07:04:19 2024 -0700

    Updated setup script to CMSSW_14_2_0_pre1

commit 135e18b
Merge: 5f9c2f6 c312b85
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 07:01:32 2024 -0700

    Merge tag 'CMSSW_14_2_0_pre1' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit f68981e
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 06:57:59 2024 -0700

    Updated setup script to CMSSW_14_2_0_pre1

commit d764312
Merge: 5f9c2f6 c312b85
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Sep 16 06:52:36 2024 -0700

    Merge tag 'CMSSW_14_2_0_pre1' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch7

commit 5f9c2f6
Author: Slava Krutelyov <[email protected]>
Date:   Fri Sep 13 10:46:41 2024 -0700

    new style code-checks from cms-bot https://cmssdt.cern.ch/SDT/code-checks/cms-sw-PR-45117/41778/code-format.patch; the result looks less readable, but we have to comply

commit 2bc333b
Merge: ff27cf3 46f7f22
Author: Slava Krutelyov <[email protected]>
Date:   Fri Sep 13 09:13:42 2024 -0700

    Merge pull request #88 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch6

    Batch 6 for updates to LST integration in cms-sw

commit 46f7f22
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Sep 3 08:30:40 2024 -0700

    Finished cleaning namespaces

commit d2b9e89
Merge: f245be0 f0e560b
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 30 15:18:33 2024 -0700

    Merge pull request #89 from SegmentLinking/more_review_fixes

    More review fixes: smart pointers, cleaner namespaces, naming fixes

commit f0e560b
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 30 11:35:38 2024 -0700

    Renamed private data members

commit 3eb7a56
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 30 11:03:29 2024 -0700

    Addressed review comments

commit 0340221
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 30 10:42:33 2024 -0700

    Cleaned up namespaces

commit 1bff72d
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Aug 27 10:48:36 2024 -0700

    Started moving to smart pointers

commit f245be0
Merge: 9713499 24f587e
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 28 10:25:07 2024 -0700

    Merge pull request #85 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_smallFixesPostBatch5

    Small fixes post batch 5

commit 24f587e
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 28 08:11:54 2024 -0700

    Invert DeltaPhi arguments in CMSSW to harmonize with standalone

commit b5a1383
Author: Manos Vourliotis <[email protected]>
Date:   Sun Aug 25 11:19:49 2024 -0700

    Harmonize pixelType determination in CMSSW with the standalone

commit bb8402d
Author: Manos Vourliotis <[email protected]>
Date:   Sun Aug 25 10:40:56 2024 -0700

    Addressing review comments on PixelType

commit 1b6a0e1
Author: Manos Vourliotis <[email protected]>
Date:   Thu Aug 22 16:09:54 2024 -0700

    Apply review comments

commit 9713499
Merge: ff27cf3 3864e82
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 21 18:52:16 2024 +0200

    Merge pull request #87 from slava77/CMSSW_14_1_0_pre5/LSTb6-alpaka-wait-bugfix

    bugfixes to incomplete alpaka::wait cleanup (for batch6)

commit c4d12fc
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 21 03:04:50 2024 -0700

    Simplify consumes(), esConsumes(), produces() and code checks/format

commit 03da845
Author: Manos Vourliotis <[email protected]>
Date:   Wed Aug 21 02:45:29 2024 -0700

    Make a data member private

commit 3864e82
Author: Slava Krutelyov <[email protected]>
Date:   Tue Aug 20 17:34:59 2024 -0700

    bugfixes to incomplete alpaka::wait cleanup: need to wait to get counters; need to write to CPU buffer asyncronously or directly only after a sync

commit fcb5e32
Author: Manos Vourliotis <[email protected]>
Date:   Tue Aug 20 11:45:11 2024 -0700

    Work on pixelType and removal of deprecated functions in standalone

commit 9544a58
Author: Manos Vourliotis <[email protected]>
Date:   Mon Aug 19 11:22:56 2024 -0700

    Revise some includes

commit ff27cf3
Merge: 77854d9 fe0d0ac
Author: Slava Krutelyov <[email protected]>
Date:   Sat Aug 17 10:08:17 2024 -0700

    Merge pull request #79 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch5

    Batch 5 for updates to LST integration in cms-sw

commit fe0d0ac
Merge: fb5c0ea 79ea879
Author: Slava Krutelyov <[email protected]>
Date:   Sat Aug 17 10:02:33 2024 -0700

    Merge pull request #84 from SegmentLinking/use_namespaces_instead_of_templates

    Moved LST and Event classes to ALPAKA_ACCELERATOR_NAMESPACE

commit 79ea879
Author: Andres Rios Tascon <[email protected]>
Date:   Sat Aug 17 07:31:46 2024 -0700

    Moved all alpaka code to ALPAKA_ACCELERATOR_NAMESPACE

commit 1a5e2c4
Merge: 9f6d612 fb5c0ea
Author: Andres Rios Tascon <[email protected]>
Date:   Sat Aug 17 05:27:27 2024 -0700

    Merge branch 'CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch5' into use_namespaces_instead_of_templates

commit fb5c0ea
Merge: 4ff4aaf 5cce69a
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 16 15:08:14 2024 -0700

    Merge pull request #83 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_destructorsMovesKernelNames

    Remove user-defined destructors, make vector moves useful, rename kernels

commit 9f6d612
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 16 12:55:26 2024 -0700

    Moved LST and Event classes to ALPAKA_ACCELERATOR_NAMESPACE

commit 5cce69a
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 11:04:46 2024 -0700

    Code format and checks

commit 787dfe1
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 10:38:02 2024 -0700

    Renaming of kernels

commit d5e443a
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 09:33:38 2024 -0700

    Remove user-defined destructors

commit 8d2366b
Author: Manos Vourliotis <[email protected]>
Date:   Fri Aug 16 09:15:04 2024 -0700

    Remove pass by const reference when std::move-ing

commit 4ff4aaf
Merge: c1767fa 7889093
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 16 13:13:52 2024 -0400

    Merge pull request #77 from slava77/CMSSW_14_1_0_pre5/LSTb5-alpaka-calls-review

    batch5: alpaka::wait and use views to local host data instead of buffers

commit 7889093
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 15 16:43:14 2024 -0700

    add synchronizations in callers of the event methods where it matters; make synchronization more explicit/flexible in names or function arguments

commit c1767fa
Merge: d3549cb 22192ec
Author: Slava Krutelyov <[email protected]>
Date:   Wed Aug 14 15:49:57 2024 -0700

    Merge pull request #82 from SegmentLinking/more_review_fixes

    More review fixes

commit 43ce20e
Author: Slava Krutelyov <[email protected]>
Date:   Mon Aug 12 15:26:08 2024 -0700

    explicitly require 1D single block kernels to use Acc1D and have one block with asserts

commit 22192ec
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 12 12:19:53 2024 -0700

    Add include for fp16 on HIP

commit a0432cc
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 12 12:09:26 2024 -0700

    Reduce number of moduleConnections_ lookups

commit 80ffdc3
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 12 11:51:40 2024 -0700

    Changed syntax of atomic operations

commit c6a2468
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 15:35:06 2024 -0700

    lst::createWorkDiv now depends on Acc to avoid ODR; allocBufWrapper correct parameter is TDev

commit a7d73c0
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 06:37:00 2024 -0700

    replace alpaka::getPtrNative(buf) with buf.data()

commit 4ef678d
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 06:21:53 2024 -0700

    switch to using alpaka::exec

commit 7343156
Author: Slava Krutelyov <[email protected]>
Date:   Thu Aug 8 05:31:06 2024 -0700

    cleanup unnecessary alpaka::wait; add comments justifying other alpaka::wait calls; switch to cms::alpakatools::make_host_buffer for a few local buffers

commit e8cc7a8
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 16:20:25 2024 -0700

    cleanup unnecessary alpaka::wait

commit 8557644
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 08:16:42 2024 -0700

    remove spurious semicolons at the end of method implementations

commit d3549cb
Merge: 77854d9 8f720ad
Author: Slava Krutelyov <[email protected]>
Date:   Mon Aug 5 14:33:06 2024 -0700

    Merge pull request #76 from SegmentLinking/LSTESData_fixes

    LSTESData fixes

commit 8f720ad
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Aug 5 07:57:46 2024 -0700

    Fixed memcpy

commit 77854d9
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 16:13:09 2024 -0700

    name=1 -> name=RecoTracker/LSTCore

commit 4cd5974
Merge: 1d9b396 ecd8e3e
Author: Slava Krutelyov <[email protected]>
Date:   Fri Aug 2 13:42:50 2024 -0700

    Merge pull request #66 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch4

    Batch 4 for updates to LST integration in cms-sw

commit 14b8bd9
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Aug 2 08:36:24 2024 -0700

    Minor cleanup

commit 0bcb06c
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 31 14:00:24 2024 -0700

    Removed alpaka functions from host ES code

commit ecd8e3e
Merge: d7689bb a076afb
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 31 11:11:06 2024 -0700

    Merge pull request #72 from SegmentLinking/removalOfSDL

    Total removal of sdl/SDL

commit d7689bb
Merge: 24aa3a2 5b1e21c
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 31 07:09:00 2024 -0700

    Merge pull request #73 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_fixWorkflowConflict2

    Resolving latest workflow conflict

commit 5b1e21c
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 31 02:50:16 2024 -0700

    Fix workflow conflict

commit a076afb
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 31 01:30:09 2024 -0700

    Remove forgotten flag

commit c3f41a7
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 11:26:35 2024 -0700

    Code checks and format

commit 67c2376
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 10:57:10 2024 -0700

    Simplification of variable naming

commit d378a59
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 10:33:43 2024 -0700

    Removal of sdl/SDL from all standalone code

commit 24aa3a2
Merge: 3fc9904 944e1b4
Author: Slava Krutelyov <[email protected]>
Date:   Tue Jul 30 08:34:03 2024 -0700

    Merge pull request #71 from SegmentLinking/renameClassesRemoveCopies

    More work on Constants and removal of vector copies

commit 961d01e
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 07:53:28 2024 -0700

    Remove sdl from variable names

commit 944e1b4
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 07:27:10 2024 -0700

    Code checks and format

commit 5d5bd29
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 05:37:34 2024 -0700

    Split PixelTriplets to PixelQuintuplets

commit ae851e0
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 05:27:15 2024 -0700

    Fourth batch of fixing function arguments

commit 3fc9904
Merge: fac2958 d5e0b69
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 13:46:03 2024 +0300

    Merge pull request #70 from slava77/CMSSW_14_1_0_pre5/LSTb4-buf-lite

    alpaka modernise/improve for batch4

commit 954a22a
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 30 03:31:08 2024 -0700

    Third batch of fixing function arguments

commit 2af0685
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 29 08:01:16 2024 -0700

    Second batch of fixing function arguments

commit ce79bc1
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 29 06:03:10 2024 -0700

    First batch of fixing function arguments

commit 96aa7c0
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 27 17:11:01 2024 -0700

    Revert constness on arguments passed by value

commit e076050
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 27 14:51:16 2024 -0700

    Revert moving general purpose functions to common CMSSW file

commit 9268f49
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jul 26 06:27:32 2024 -0700

    More constness, removal of vector copies, and movement of general-purpose alpaka functions

commit d5e0b69
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 24 16:12:31 2024 -0700

    remove Vec3D createVec

commit 07e0f40
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 24 15:55:20 2024 -0700

    geometry ::get single search

commit 77e6b9a
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 24 09:44:52 2024 -0700

    Removal of vector copies, as per comments

commit 375a06c
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 24 06:45:27 2024 -0700

    Renaming of constants and removal of custom functions now implemented in alpaka

commit 69debc2
Author: Slava Krutelyov <[email protected]>
Date:   Tue Jul 23 15:58:55 2024 -0700

    use cms::alpakatools::once_per_block

commit fac2958
Merge: ff12237 7fdcabd
Author: Slava Krutelyov <[email protected]>
Date:   Mon Jul 22 14:27:41 2024 -0700

    Merge pull request #68 from SegmentLinking/renameClassesRemoveCopies

    Renaming of namespaces/classes/macros and removal of vector, etc. copies

commit 7fdcabd
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 22 10:06:11 2024 -0700

    Renaming of classes/structs/macros/constants

commit a22faeb
Author: Manos Vourliotis <[email protected]>
Date:   Sun Jul 21 14:34:26 2024 -0700

    Revert change in TrackListMerger

commit 304929e
Author: Manos Vourliotis <[email protected]>
Date:   Sun Jul 21 14:25:50 2024 -0700

    Fixes after rebase

commit e54c6f1
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 20 08:04:57 2024 -0700

    Apply comments namespace and type renaming

commit 1a6e27b
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jul 20 07:42:27 2024 -0700

    Fix for wrong loop range in pT3 kernel

commit 5d0ef1e
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jul 19 09:44:07 2024 -0700

    Namespace renaming SDL->lst and inclusion of the T5DNN->t5dnn namespace under it

commit ff12237
Merge: 1250a8c d0e320a
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Jul 19 19:50:11 2024 -0400

    Merge pull request #67 from slava77/CMSSW_14_1_0_pre5/LSTb4-buf-base

    remove inheritance of buffers on underlying SoAs

commit d0e320a
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jul 19 08:56:04 2024 -0700

    remove inheritance of buffers on underlying SoAs

commit 1fb0489
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jul 19 08:55:13 2024 -0700

    split ranges from modules

commit 1250a8c
Merge: 1d9b396 fb12af0
Author: Slava Krutelyov <[email protected]>
Date:   Thu Jul 18 14:34:11 2024 -0700

    Merge pull request #65 from SegmentLinking/use_common_library

    Move some things out into a common library

commit fb12af0
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Jul 18 07:44:57 2024 -0700

    Format code

commit d33ac32
Author: Andres Rios Tascon <[email protected]>
Date:   Thu Jul 18 07:28:52 2024 -0700

    A bit more cleanup

commit ccd29f4
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 17 11:17:35 2024 -0700

    Format and cleanup

commit c4ac510
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 17 11:10:51 2024 -0700

    Fixed standalone compilation

commit 64a7bf1
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jul 17 10:41:54 2024 -0700

    Moved more things out of the alpaka directory

commit 9fd3355
Author: Andres Rios-Tascon <[email protected]>
Date:   Mon Jul 15 11:28:07 2024 -0400

    Use pre-defined alpaka types

commit 9c87a88
Author: Andres Rios-Tascon <[email protected]>
Date:   Thu Jul 11 13:04:39 2024 -0400

    Moved some things out into a common library

commit 1d9b396
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Jul 16 11:25:54 2024 -0700

    Updated setup scripts to use CMSSW 14_1_0_pre5

commit 23ec786
Merge: 7187927 b20c7aa
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Jul 16 11:17:08 2024 -0700

    Merge tag 'CMSSW_14_1_0_pre5' into CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles

commit 7187927
Merge: 4cd8924 34c56c6
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jul 10 15:55:04 2024 -0700

    Merge pull request #50 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch3

    Batch 3 for updates to LST integration in cms-sw

commit 34c56c6
Merge: ae67290 86503a2
Author: Slava Krutelyov <[email protected]>
Date:   Tue Jul 9 16:29:56 2024 -0700

    Merge pull request #49 from SegmentLinking/ESProducer_fixes

    ESProducer fixes

commit ae67290
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 9 06:07:31 2024 -0700

    Simplify LST workflows

commit 7cfe3a5
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 9 06:06:39 2024 -0700

    Code format and checks

commit a3a8054
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jul 9 05:19:42 2024 -0700

    Even further work on naming values and sqrt, loop, etc. simplifications

commit 86503a2
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jul 8 07:41:35 2024 -0700

    Fixed include guards for headers in interface directory

commit f47212f
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jul 8 07:32:46 2024 -0700

    Renamed new endcap geometry class

commit d3e5999
Merge: f46b6cb c563eb0
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jul 8 08:07:27 2024 -0700

    Merge remote-tracking branch 'SegLink/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch3' into ESProducer_fixes

commit c563eb0
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jul 8 07:39:49 2024 -0700

    Further work on naming values and sqrt, loop, etc. simplifications

commit 4d7e54a
Merge: a97714a dc13ac5
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jul 5 09:15:23 2024 -0700

    Merge pull request #58 from SegmentLinking/remove_LST_IS_CMSSW_PACKAGE

    combo of: Remove LST_IS_CMSSW_PACKAGE (#47), configurable dup cleaning (#37), typo in T3 code (#44)

commit a97714a
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jul 3 07:16:19 2024 -0700

    Apply reco comments: Naming values and sqrt, loop, etc. simplifications

commit 236ad8c
Author: Manos Vourliotis <[email protected]>
Date:   Sat Jun 29 02:43:48 2024 -0700

    Simplification of sqrt operations for pT3s

commit 149c628
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jun 28 21:23:31 2024 +0200

    Resolve conflicts regarding workflows

commit f46b6cb
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jun 24 12:52:12 2024 -0700

    Removed -Wshadow flag

commit eb5de05
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jun 24 11:30:45 2024 -0700

    Minor cleanup

commit a3f65da
Author: Andres Rios Tascon <[email protected]>
Date:   Mon Jun 24 11:00:13 2024 -0700

    Separated EndcapGeometry into host-only and buffers struct

commit ef48f74
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jun 24 02:21:11 2024 -0700

    Removal of gpu modifier from LST workflows

commit e0acfa5
Author: Andres Rios Tascon <[email protected]>
Date:   Tue Jun 18 10:40:38 2024 -0700

    Addressed ESProducer comments

commit 4cd8924
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jun 14 18:00:59 2024 -0700

    code-format/checks

commit e64c2cc
Merge: 314e95d 3552ad3
Author: Slava Krutelyov <[email protected]>
Date:   Fri Jun 14 17:45:17 2024 -0700

    Merge pull request #38 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_batch2

    Batch 2 for updates to LST integration in cms-sw

commit dc13ac5
Author: Andres Rios Tascon <[email protected]>
Date:   Fri Jun 14 16:53:31 2024 -0400

    Removed LST_IS_CMSSW_PACKAGE flag

commit 14af981
Merge: f555485 f4bd702
Author: Slava Krutelyov <[email protected]>
Date:   Thu Jun 13 14:18:35 2024 -0700

    Merge pull request #44 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_TrackLooperPR407

    Fix typo in T3 code

commit 3552ad3
Author: Manos Vourliotis <[email protected]>
Date:   Thu Jun 13 09:42:00 2024 -0700

    Fixing CMS coding rule 1

commit f4bd702
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jun 12 06:28:40 2024 -0700

    Fix typo in T3 code

commit 944652f
Author: Manos Vourliotis <[email protected]>
Date:   Tue Jun 11 01:17:16 2024 +0200

    Keep comment closer to the added task object

    Co-authored-by: Slava Krutelyov <[email protected]>

commit f555485
Merge: 314e95d 0829926
Author: Slava Krutelyov <[email protected]>
Date:   Mon Jun 10 14:41:22 2024 -0700

    Merge pull request #37 from SegmentLinking/CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles_TrackLooperPR408

    Make compilation flags for duplicate cleaning and triplet pLSs into runtime flags (TrackLooper PR#408 + cmssw PR#31)

commit 85682e8
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jun 10 09:08:42 2024 -0700

    Resolving PR comments LST folder

commit 0829926
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jun 7 18:36:46 2024 -0700

    Code checks and format

commit 4747b41
Author: Manos Vourliotis <[email protected]>
Date:   Fri Jun 7 16:53:38 2024 -0700

    Make compilation flags for duplicate cleaning and triplet pLSs into runtime flags (TrackLooper PR#408 + cmssw PR#31)

commit 314e95d
Author: Slava Krutelyov <[email protected]>
Date:   Thu Jun 6 16:51:30 2024 -0700

    code-format

commit 9f697fd
Author: Slava Krutelyov <[email protected]>
Date:   Wed Jun 5 16:39:31 2024 -0700

    put lstModulesDevESProducer on a dummy visible task to bypass the module creation

commit e9733d4
Author: Manos Vourliotis <[email protected]>
Date:   Thu Jun 6 14:58:08 2024 -0700

    Remove outdated files

commit f1dee27
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jun 5 09:33:05 2024 -0400

    Truncate git logs to 100 commits

commit ee1e94e
Author: Andres Rios Tascon <[email protected]>
Date:   Wed Jun 5 09:32:32 2024 -0400

    Fixed standalone build

commit 0edc116
Author: Manos Vourliotis <[email protected]>
Date:   Wed Jun 5 15:00:16 2024 -0700

    Update directory for LST data files

commit 7c6bcfa
Author: Manos Vourliotis <[email protected]>
Date:   Mon Jun 3 10:16:56 2024 -0700

    Add two-iteration,tracking-only LST workflows, both on CPU and GPU

commit 7bc53be
Author: Andres Rios Tascon <[email protected]>
Date:   Fri May 31 14:21:58 2024 -0400

    Added RecoTracker/LST package

    Co-authored-by: Manos Vourliotis <[email protected]>
    Co-authored-by: Slava Krutelyov <[email protected]>

commit 0cf5c03
Author: Andres Rios Tascon <[email protected]>
Date:   Fri May 31 14:19:46 2024 -0400

    Added RecoTracker/LSTCore package

    Co-authored-by: Tres Reid <[email protected]>
    Co-authored-by: Philip Chang <[email protected]>
    Co-authored-by: Gavin Niendorf <[email protected]>
    Co-authored-by: YonsiG <[email protected]>
    Co-authored-by: Balaji Sathia Narayanan <[email protected]>
    Co-authored-by: Manos Vourliotis <[email protected]>
    Co-authored-by: Slava Krutelyov <[email protected]>
    Co-authored-by: Jonathan Guiang <[email protected]>
    Co-authored-by: Bei Wang <[email protected]>

Co-authored-by: Tres Reid <[email protected]>
Co-authored-by: Philip Chang <[email protected]>
Co-authored-by: Gavin Niendorf <[email protected]>
Co-authored-by: YonsiG <[email protected]>
Co-authored-by: Balaji Sathia Narayanan <[email protected]>
Co-authored-by: Manos Vourliotis <[email protected]>
Co-authored-by: Slava Krutelyov <[email protected]>
Co-authored-by: Jonathan Guiang <[email protected]>
Co-authored-by: Bei Wang <[email protected]>
@ariostas ariostas force-pushed the CMSSW_14_1_0_pre3_LST_X_LSTCore_realfiles branch from c21a481 to 1c51f23 Compare November 13, 2024 18:40
@ariostas
Copy link
Member Author

I force-pushed with a single commit co-authored by everyone, and the diff is empty, so I think we're all set

@ariostas ariostas merged commit 48600da into master Nov 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants