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

General setup overhaul #45

Merged
merged 33 commits into from
Jul 13, 2024
Merged
Show file tree
Hide file tree
Changes from 26 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
a12b536
Remove unused files.
tvoigtlaender Jun 12, 2024
9285574
update law
tvoigtlaender Jun 13, 2024
6865dfc
Update envs and configs
tvoigtlaender Jun 13, 2024
ab9ee81
Update and clean up framework.py
tvoigtlaender Jun 13, 2024
9c7f9ea
Clean up env setup of setup.sh\n Only set up starting env through cvm…
tvoigtlaender Jun 14, 2024
ffcbc07
Minor changes
tvoigtlaender Jun 14, 2024
761036f
Clean up setup.sh further
tvoigtlaender Jun 14, 2024
a3597b9
Remove OS check during setup and move software for sample_manager int…
tvoigtlaender Jun 14, 2024
54d1151
Change docker image tag to dev branch
tvoigtlaender Jun 15, 2024
35ea7d2
Update envs yml files
tvoigtlaender Jun 15, 2024
4529815
update re-update KingMaker env based on original env. Fix issue in ta…
tvoigtlaender Jun 16, 2024
e6f94a4
Add rucio py-module to KingMaker env for sample_manager
Jun 16, 2024
6578578
Seperate ML_train env into ROOT env and ML env due to size issues of …
Jun 16, 2024
6d25b13
Return to previous naming of envs
tvoigtlaender Jun 16, 2024
63df83a
Update ML_LAW env. Fix names
tvoigtlaender Jun 17, 2024
523c56d
Move env files to kingmaker-images. Add warning to sample manager. Ad…
tvoigtlaender Jun 17, 2024
5676dc7
Enforce accepted OS
tvoigtlaender Jun 17, 2024
24cb5d2
Syntax error
tvoigtlaender Jun 17, 2024
1596efc
Remove repeated print
tvoigtlaender Jun 17, 2024
05df15b
Disable usage of cvmfs for local envs until new envs are rolled out.
tvoigtlaender Jun 17, 2024
cd52fa3
Fix submodule
tvoigtlaender Jun 17, 2024
145a241
Fix OS query for Alma9
tvoigtlaender Jun 18, 2024
7237053
Make OS parsing in framework.py more similar to parsing in os-version.sh
tvoigtlaender Jun 18, 2024
21b503c
use same name for AlmaLinux in both OS checks (Alma)
tvoigtlaender Jun 18, 2024
d05ec84
Update env submodule. Generalize compile script path fixing. Formating
tvoigtlaender Jul 9, 2024
4875acb
Update xrootd to 5.7
tvoigtlaender Jul 10, 2024
96b375d
formating and minor deepsource issues
tvoigtlaender Jul 11, 2024
7071854
Use main branch of kingmaker-images with merged PR
tvoigtlaender Jul 11, 2024
e1540ff
Cleanup
tvoigtlaender Jul 11, 2024
68be54a
shortened target path for local cvmfs envs. Note: does not exist as o…
tvoigtlaender Jul 12, 2024
1c0f039
Add backwards compatability for older law versions.
tvoigtlaender Jul 12, 2024
537813d
Ablack
tvoigtlaender Jul 12, 2024
8aa59ae
Use submodule hash to identify correct image
tvoigtlaender Jul 12, 2024
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 .deepsource.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ version = 1
name = "python"

[analyzers.meta]
runtime_version = "3.x.x"
runtime_version = "3.x.x"
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ logs/
*.tar.gz
*.txt
miniconda/
miniforge/
quantities_map/
output/
CROWN/
Expand Down
5 changes: 4 additions & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@
url = git@github.com:KIT-CMS/KingMaker_sample_database.git
[submodule "sm-htt-analysis"]
path = sm-htt-analysis
url = git@github.com:tvoigtlaender/sm-htt-analysis.git
url = git@github.com:tvoigtlaender/sm-htt-analysis.git
[submodule "kingmaker-images"]
path = kingmaker-images
url = https://github.com/KIT-CMS/kingmaker-images.git
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ source setup.sh <Analysis Name>
this should setup the environment specified in the luigi.cfg file (located at `lawluigi_configs/<Analysis Name>_luigi.cfg`), which includes all needed packages.
The environment is sourced from the conda instance located at `/cvmfs/etp.kit.edu/LAW_envs/conda_envs/miniconda/` if possible.
If the relevant environment is not available this way, the environment will be set up in a local conda instance.
The environment files are located at `conda_environments/<Analysis Name>_env.cfg`.
The environment files are located at `kingmaker-images/KingMaker_envs/<Analysis Name>_env.cfg`.
In addition other files are installed depending on the analysis.

A list of available analyses can be found in the `setup.sh` script or by running
Expand Down
256 changes: 0 additions & 256 deletions conda_environments/BaseWRoot_env.yml

This file was deleted.

106 changes: 0 additions & 106 deletions conda_environments/KingMaker_env.yml

This file was deleted.

Loading
Loading