diff --git a/config b/config new file mode 120000 index 00000000..69680468 --- /dev/null +++ b/config @@ -0,0 +1 @@ +python/lsst/ctrl/bps/panda/resources/config \ No newline at end of file diff --git a/pyproject.toml b/pyproject.toml index 7dbb704b..d41a6810 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -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" } diff --git a/python/lsst/ctrl/bps/panda/conf_example/example_panda_SLAC.yaml b/python/lsst/ctrl/bps/panda/conf_example/example_panda_SLAC.yaml index 0a383c1d..0a3b47ee 100644 --- a/python/lsst/ctrl/bps/panda/conf_example/example_panda_SLAC.yaml +++ b/python/lsst/ctrl/bps/panda/conf_example/example_panda_SLAC.yaml @@ -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: diff --git a/python/lsst/ctrl/bps/panda/conf_example/pipelines_check_idf.yaml b/python/lsst/ctrl/bps/panda/conf_example/pipelines_check_idf.yaml index 9a3e0caf..56246818 100644 --- a/python/lsst/ctrl/bps/panda/conf_example/pipelines_check_idf.yaml +++ b/python/lsst/ctrl/bps/panda/conf_example/pipelines_check_idf.yaml @@ -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 diff --git a/python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml b/python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml index 2f01d05c..3a117e32 100644 --- a/python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml +++ b/python/lsst/ctrl/bps/panda/conf_example/test_idf.yaml @@ -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" diff --git a/python/lsst/ctrl/bps/panda/conf_example/test_sdf.yaml b/python/lsst/ctrl/bps/panda/conf_example/test_sdf.yaml index d22fd749..fefe110b 100644 --- a/python/lsst/ctrl/bps/panda/conf_example/test_sdf.yaml +++ b/python/lsst/ctrl/bps/panda/conf_example/test_sdf.yaml @@ -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" diff --git a/python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml b/python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml index 399ed02c..2b5133b8 100644 --- a/python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml +++ b/python/lsst/ctrl/bps/panda/conf_example/test_usdf.yaml @@ -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" diff --git a/config/bps_frdf.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_frdf.yaml similarity index 93% rename from config/bps_frdf.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_frdf.yaml index ab818adf..7a9f5e6a 100644 --- a/config/bps_frdf.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_frdf.yaml @@ -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 diff --git a/config/bps_idf.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_idf.yaml similarity index 96% rename from config/bps_idf.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_idf.yaml index 09a4de58..92b0486e 100644 --- a/config/bps_idf.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_idf.yaml @@ -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 diff --git a/config/bps_panda.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_panda.yaml similarity index 93% rename from config/bps_panda.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_panda.yaml index c3264084..66d38eff 100644 --- a/config/bps_panda.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_panda.yaml @@ -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 diff --git a/config/bps_panda_DF.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_DF.yaml similarity index 92% rename from config/bps_panda_DF.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_panda_DF.yaml index 99764d99..7a1e0de3 100644 --- a/config/bps_panda_DF.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_DF.yaml @@ -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 diff --git a/config/bps_panda_cmd.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_cmd.yaml similarity index 89% rename from config/bps_panda_cmd.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_panda_cmd.yaml index 50f1dd43..ab7675e2 100644 --- a/config/bps_panda_cmd.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_cmd.yaml @@ -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 diff --git a/config/bps_panda_eventservice.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_eventservice.yaml similarity index 100% rename from config/bps_panda_eventservice.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_panda_eventservice.yaml diff --git a/config/bps_panda_orderid_map.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_orderid_map.yaml similarity index 100% rename from config/bps_panda_orderid_map.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_panda_orderid_map.yaml diff --git a/config/bps_panda_qnode_map.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_panda_qnode_map.yaml similarity index 100% rename from config/bps_panda_qnode_map.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_panda_qnode_map.yaml diff --git a/config/bps_remote.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_remote.yaml similarity index 93% rename from config/bps_remote.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_remote.yaml index 082969e5..ab0756e5 100644 --- a/config/bps_remote.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_remote.yaml @@ -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 diff --git a/config/bps_ukdf.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_ukdf.yaml similarity index 93% rename from config/bps_ukdf.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_ukdf.yaml index 40407db4..6a30c473 100644 --- a/config/bps_ukdf.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_ukdf.yaml @@ -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 diff --git a/config/bps_usdf.yaml b/python/lsst/ctrl/bps/panda/resources/config/bps_usdf.yaml similarity index 93% rename from config/bps_usdf.yaml rename to python/lsst/ctrl/bps/panda/resources/config/bps_usdf.yaml index b77b029b..f10255e8 100644 --- a/config/bps_usdf.yaml +++ b/python/lsst/ctrl/bps/panda/resources/config/bps_usdf.yaml @@ -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