Skip to content

DM-51000: Prepare for eups less installations #120

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

Open
mwittgen wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DM-51000: Prepare for eups less installations #120

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
1 change: 1 addition & 0 deletions config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
python/lsst/ctrl/bps/panda/resources/config
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ where = ["python"]
zip-safe = true

[tool.setuptools.package-data]
"lsst.ctrl.bps.panda" = ["conf_example/*.yaml"]
"lsst.ctrl.bps.panda" = ["conf_example/*.yaml", "config/*.yaml"]

[tool.setuptools.dynamic]
version = { attr = "lsst_versions.get_lsst_version" }
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/panda/conf_example/example_panda_SLAC.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ payload:
ls -a;
setup lsst_distrib;
env;
python3 ${CTRL_BPS_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_
python3 -m lsst.ctrl.bps.panda.edgenode.cmd_line_decoder _cmd_line_

pipetask:
pipetaskInit:
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/panda/conf_example/pipelines_check_idf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_idf.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_idf.yaml

project: dev
campaign: quick
Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# An example bps submission yaml

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_idf_new.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_idf_new.yaml

pipelineYaml: "${OBS_LSST_DIR}/pipelines/imsim/DRP.yaml#step1"

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/panda/conf_example/test_sdf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
LSST_VERSION: w_2022_32

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_usdf.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_usdf.yaml

queue: "SLAC_Rubin_SDF"

Expand Down
2 changes: 1 addition & 1 deletion python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
LSST_VERSION: w_2022_32

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_usdf.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_usdf.yaml

pipelineYaml: "${DRP_PIPE_DIR}/pipelines/HSC/DRP-RC2.yaml#isr"

Expand Down
2 changes: 1 addition & 1 deletion config/bps_frdf.yaml → .../bps/panda/resources/config/bps_frdf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BPS PanDA configuration for FrDF

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_panda.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_panda.yaml

project: dev
campaign: quick
Expand Down
2 changes: 1 addition & 1 deletion config/bps_idf.yaml → ...l/bps/panda/resources/config/bps_idf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_panda.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_panda.yaml


project: dev
Expand Down
2 changes: 1 addition & 1 deletion config/bps_panda.yaml → ...bps/panda/resources/config/bps_panda.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ payloadCommand: >
{setupLSSTEnv}
pwd;
export RUBIN_ES_MAP_FILE=orderIdMapFilename;
python3 \${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_ & pJob=\$!;
python3 -m lsst.ctrl.bps.panda.edgenode.cmd_line_decoder _cmd_line_ & pJob=\$!;
prmon -i 5
-f ${logDir}/memory_monitor_output.txt
-j ${logDir}/memory_monitor_summary.json
Expand Down
2 changes: 1 addition & 1 deletion config/bps_panda_DF.yaml → .../panda/resources/config/bps_panda_DF.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# --compute-site is necessary to use this yaml for bps submit

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_panda.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_panda.yaml

project: dev
campaign: quick
Expand Down
2 changes: 1 addition & 1 deletion config/bps_panda_cmd.yaml → ...panda/resources/config/bps_panda_cmd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ payloadCommand: >
export PANDA_BEHIND_REAL_LB=true;
pwd;
export RUBIN_ES_MAP_FILE=orderIdMapFilename;
python3 \${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/cmd_line_decoder.py _cmd_line_ & pJob=\$!;
python3 -m lsst.ctrl.bps.panda.edgenode.cmd_line_decoder _cmd_line_ & pJob=\$!;
prmon -i 5
-f ${logDir}/memory_monitor_output.txt
-j ${logDir}/memory_monitor_summary.json
Expand Down
0 config/bps_panda_eventservice.yaml → ...ources/config/bps_panda_eventservice.yaml
View file
Open in desktop
File renamed without changes.
0 config/bps_panda_orderid_map.yaml → ...sources/config/bps_panda_orderid_map.yaml
View file
Open in desktop
File renamed without changes.
0 config/bps_panda_qnode_map.yaml → ...resources/config/bps_panda_qnode_map.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion config/bps_remote.yaml → ...ps/panda/resources/config/bps_remote.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ remoteBuild:
export PANDA_BEHIND_REAL_LB=true;
export IDDS_MAX_NAME_LENGTH={IDDS_MAX_NAME_LENGTH};
{custom_lsst_setup}
python3 ${CTRL_BPS_PANDA_DIR}/python/lsst/ctrl/bps/panda/edgenode/build_cmd_line_decoder.py \
python3 -m lsst.ctrl.bps.panda.edgenode.build_cmd_line_decoder \
_download_cmd_line_ _build_cmd_line_ _compute_site_ & pJob=$!;
prmon -i 5
-f ${logDir}/memory_monitor_output.txt
Expand Down
2 changes: 1 addition & 1 deletion config/bps_ukdf.yaml → .../bps/panda/resources/config/bps_ukdf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# BPS PanDA configuration for UKDF

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_panda.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_panda.yaml

project: dev
campaign: quick
Expand Down
2 changes: 1 addition & 1 deletion config/bps_usdf.yaml → .../bps/panda/resources/config/bps_usdf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This yaml evolves with the progress of the PanDA deployment

includeConfigs:
- ${CTRL_BPS_PANDA_DIR}/config/bps_panda.yaml
- resource://lsst.ctrl.bps.panda/resources/config/bps_panda.yaml

project: dev
campaign: quick
Expand Down
Loading