From 982775b7f9393ab199e8b4de79a5a84817eabe02 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 7 Jun 2023 15:48:39 -0700 Subject: [PATCH 01/93] CI: `EWMS_PILOT_CONCURRENT_TASKS: 3` --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c98a31125..42e98275d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,6 +20,7 @@ env: SKYSCAN_BROKER_CLIENT: rabbitmq # note: auth env vars are in job(s) EWMS_PILOT_TASK_TIMEOUT: 600 + EWMS_PILOT_CONCURRENT_TASKS: 3 SKYSCAN_DEBUG_DIR: debug-pkl-dir SKYSCAN_MQ_TIMEOUT_TO_CLIENTS: 60 # SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS: 60 # use default From 7f9e4f47cfbc73f6474d9131c7719c4acf0a2e9b Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 22:49:49 +0000 Subject: [PATCH 02/93] update requirements-all.txt --- requirements-all.txt | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index 47c270362..584df3dff 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via @@ -22,7 +22,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -40,7 +40,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.1.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -54,7 +54,7 @@ matplotlib==3.7.1 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -nats-py[nkeys]==2.2.0 +nats-py[nkeys]==2.3.1 # via oms-mqclient nkeys==0.1.0 # via nats-py @@ -78,19 +78,19 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pika==1.3.2 # via oms-mqclient pillow==9.5.0 # via matplotlib -pulsar-client==3.1.0 +pulsar-client==3.2.0 # via oms-mqclient pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -119,21 +119,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) From 69713a24b4a5e7e4b2646c8f555593ad6c7e2ab5 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 22:49:49 +0000 Subject: [PATCH 03/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 22a4bcbb6..5e8196334 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -34,11 +34,11 @@ healpy==1.16.2 # skymap-scanner (setup.py) htchirp==2.0 # via ewms-pilot -htcondor==10.3.0 +htcondor==10.5.0 # via skymap-scanner (setup.py) humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.1.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -72,7 +72,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib @@ -80,7 +80,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -109,21 +109,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) From 592e75bd73632b2d789b64c0a0385f115caccbdd Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 22:49:49 +0000 Subject: [PATCH 04/93] update requirements-nats.txt --- requirements-nats.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index b115e81e8..ea0709a22 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.1.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -52,7 +52,7 @@ matplotlib==3.7.1 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -nats-py[nkeys]==2.2.0 +nats-py[nkeys]==2.3.1 # via oms-mqclient nkeys==0.1.0 # via nats-py @@ -76,7 +76,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib @@ -84,7 +84,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -113,21 +113,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) From e53d899eb1f5484b9214123a3abd5f17d7cbea1d Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 22:49:49 +0000 Subject: [PATCH 05/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index c729cfd43..c4255a2b7 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via @@ -22,7 +22,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.1.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -72,17 +72,17 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib -pulsar-client==3.1.0 +pulsar-client==3.2.0 # via oms-mqclient pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -111,21 +111,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) From b4c959e6e1a8c41d630fb7b9780b6dd56141db3c Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 22:49:49 +0000 Subject: [PATCH 06/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index 21643660d..a1ab84a2a 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.1.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -70,7 +70,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pika==1.3.2 # via oms-mqclient @@ -80,7 +80,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -109,21 +109,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) From f546b8bb64e0b0d1b5be8817119e2ca34d7a63d5 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 22:49:49 +0000 Subject: [PATCH 07/93] update requirements.txt --- requirements.txt | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8d09f71da..4b79b569a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,7 +8,7 @@ astropy==5.3 # via # healpy # icecube-skyreader -cachetools==5.3.0 +cachetools==5.3.1 # via wipac-rest-tools certifi==2023.5.7 # via requests @@ -20,7 +20,7 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.0.7 # via matplotlib -cryptography==40.0.2 +cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.0.2 +icecube-skyreader==1.1.0 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -70,7 +70,7 @@ packaging==23.1 # via # astropy # matplotlib -pandas==2.0.1 +pandas==2.0.2 # via icecube-skyreader pillow==9.5.0 # via matplotlib @@ -78,7 +78,7 @@ pycparser==2.21 # via cffi pyerfa==2.0.0.3 # via astropy -pyjwt[crypto]==2.5.0 +pyjwt[crypto]==2.7.0 # via wipac-rest-tools pyparsing==3.0.9 # via matplotlib @@ -107,21 +107,19 @@ six==1.16.0 # via python-dateutil tornado==6.3.2 # via wipac-rest-tools -types-cryptography==3.3.23.2 - # via pyjwt -typing-extensions==4.6.0 +typing-extensions==4.6.3 # via # qrcode # wipac-dev-tools tzdata==2023.3 # via pandas -urllib3==2.0.2 +urllib3==2.0.3 # via requests -wipac-dev-tools[coloredlogs]==1.6.15 +wipac-dev-tools[coloredlogs]==1.6.16 # via # icecube-skyreader # oms-mqclient # skymap-scanner (setup.py) # wipac-rest-tools -wipac-rest-tools==1.4.18 +wipac-rest-tools==1.4.20 # via skymap-scanner (setup.py) From 7eb6740d362a64ad025fe593353d5edfaf305f1b Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 7 Jun 2023 16:28:48 -0700 Subject: [PATCH 08/93] CI: `EWMS_PILOT_CONCURRENT_TASKS` in matrix --- .github/workflows/tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 42e98275d..a1cf5389c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -20,7 +20,6 @@ env: SKYSCAN_BROKER_CLIENT: rabbitmq # note: auth env vars are in job(s) EWMS_PILOT_TASK_TIMEOUT: 600 - EWMS_PILOT_CONCURRENT_TASKS: 3 SKYSCAN_DEBUG_DIR: debug-pkl-dir SKYSCAN_MQ_TIMEOUT_TO_CLIENTS: 60 # SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS: 60 # use default @@ -276,6 +275,10 @@ jobs: # millipede_wilks, # splinempe ] + ewms_pilot_concurrent_tasks: [ + 0, + 3, + ] env: CLIENTS_PER_CPU: 1 # there isn't any improvement when >1 SKYSCAN_BROKER_ADDRESS: user1@localhost/test @@ -313,6 +316,8 @@ jobs: run: | set -x + export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + mkdir $SKYSCAN_CACHE_DIR mkdir $SKYSCAN_OUTPUT_DIR From 02cae79d98f96c8746a5a7a406f2d63d80826e71 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 7 Jun 2023 16:32:58 -0700 Subject: [PATCH 09/93] CI: dump memory stats for 1 min --- .github/workflows/tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index a1cf5389c..01c1ba893 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -347,6 +347,8 @@ jobs: echo -e "\tclient #$i launched" done + free -c 6 -s 10 # dump memory stats for 1 min + # Wait for Everyone wait -n # for server for i in $( seq 1 $nclients ); do From 886f5cccd32e3c185be1e4580e65939070652c64 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 7 Jun 2023 16:36:04 -0700 Subject: [PATCH 10/93] dump memory stats more --- .github/workflows/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 01c1ba893..7371360ca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -317,6 +317,7 @@ jobs: set -x export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + free # dump memory stats mkdir $SKYSCAN_CACHE_DIR mkdir $SKYSCAN_OUTPUT_DIR @@ -354,6 +355,8 @@ jobs: for i in $( seq 1 $nclients ); do wait -n # for client done + + free # dump memory stats - name: test output against known result (.npz/.json) run: | ls $SKYSCAN_OUTPUT_DIR From d8f1207c6e22b73ec9b4774b4e22c9771172a203 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 23:48:39 +0000 Subject: [PATCH 11/93] update requirements-all.txt --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index 584df3dff..f1c3a345b 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -40,7 +40,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.1.0 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests From 174af1ef658a5f721b9d651a73e449064e2e380d Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 23:48:39 +0000 Subject: [PATCH 12/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 5e8196334..3cec09b81 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -38,7 +38,7 @@ htcondor==10.5.0 # via skymap-scanner (setup.py) humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.1.0 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests From 4362ceea2168fd7b9107bc9a9d8e232cf297731b Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 23:48:39 +0000 Subject: [PATCH 13/93] update requirements-nats.txt --- requirements-nats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index ea0709a22..306cbf994 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.1.0 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests From 9a00dd3d0d7ba656bb272db8361567947673fcd1 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 23:48:39 +0000 Subject: [PATCH 14/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index c4255a2b7..d9c252f24 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.1.0 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests From 26084c5304aac92f9ed685ccb3691b989658f9d6 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 23:48:39 +0000 Subject: [PATCH 15/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index a1ab84a2a..d73976c4e 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.1.0 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests From b298513bbc24357fbf92552d51319ddc0a15dc13 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 7 Jun 2023 23:48:39 +0000 Subject: [PATCH 16/93] update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 4b79b569a..b211b4c2a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.1.0 +icecube-skyreader==1.2.0 # via skymap-scanner (setup.py) idna==3.4 # via requests From cb22b73d47e628a8fd63d3fc0b127f504ad596d1 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 8 Jun 2023 18:44:55 +0000 Subject: [PATCH 17/93] update requirements-all.txt --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index f1c3a345b..15acb4f93 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -28,7 +28,7 @@ cycler==0.11.0 # via matplotlib ed25519==1.5 # via nkeys -ewms-pilot==0.10.2 +ewms-pilot==0.10.3 # via skymap-scanner (setup.py) fonttools==4.39.4 # via matplotlib From 732985b4068b5dfdc27824dbdcc2732fab8a6f65 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 8 Jun 2023 18:44:55 +0000 Subject: [PATCH 18/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 3cec09b81..4ef474c0b 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -24,7 +24,7 @@ cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.2 +ewms-pilot==0.10.3 # via skymap-scanner (setup.py) fonttools==4.39.4 # via matplotlib From 212c7dc8547ffe03cc492bd9375b5e2bdfae93b6 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 8 Jun 2023 18:44:55 +0000 Subject: [PATCH 19/93] update requirements-nats.txt --- requirements-nats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index 306cbf994..ea0c1ddbb 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -26,7 +26,7 @@ cycler==0.11.0 # via matplotlib ed25519==1.5 # via nkeys -ewms-pilot==0.10.2 +ewms-pilot==0.10.3 # via skymap-scanner (setup.py) fonttools==4.39.4 # via matplotlib From 08f660e873405b5e84ec44e6b749f97f9f7c054a Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 8 Jun 2023 18:44:55 +0000 Subject: [PATCH 20/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index d9c252f24..e21de4f3b 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -26,7 +26,7 @@ cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.2 +ewms-pilot==0.10.3 # via skymap-scanner (setup.py) fonttools==4.39.4 # via matplotlib From 8ef489daaf7e449337ab07727a6a607525b05b36 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 8 Jun 2023 18:44:55 +0000 Subject: [PATCH 21/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index d73976c4e..04e9ef731 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -24,7 +24,7 @@ cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.2 +ewms-pilot==0.10.3 # via skymap-scanner (setup.py) fonttools==4.39.4 # via matplotlib From 4cfaa750ab95b25f6b17517866cd719fd3c9f14d Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 8 Jun 2023 18:44:55 +0000 Subject: [PATCH 22/93] update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b211b4c2a..1dd4210c6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ cryptography==41.0.1 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.2 +ewms-pilot==0.10.3 # via skymap-scanner (setup.py) fonttools==4.39.4 # via matplotlib From 23f2c017c13b375f6c201f2500b9fc068daa77bb Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 15 Jun 2023 15:25:52 +0000 Subject: [PATCH 23/93] update requirements-all.txt --- requirements-all.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-all.txt b/requirements-all.txt index d9bda997e..c8401a753 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -20,7 +20,7 @@ charset-normalizer==3.1.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib cryptography==41.0.1 # via pyjwt From dfb930882a8101f798ec5507d9ab5504d695c55e Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 15 Jun 2023 15:25:52 +0000 Subject: [PATCH 24/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 35dff5e8f..58ec26632 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -18,7 +18,7 @@ charset-normalizer==3.1.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib cryptography==41.0.1 # via pyjwt From c61155b71bbf6d23b4d4bd953ba154ebd6e7c960 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 15 Jun 2023 15:25:52 +0000 Subject: [PATCH 25/93] update requirements-nats.txt --- requirements-nats.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index 1c364503c..a6d5dbcc6 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -18,7 +18,7 @@ charset-normalizer==3.1.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib cryptography==41.0.1 # via pyjwt From 7c7f764b4db75a2d7fc6e01dfc33ab7267f8a5a9 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 15 Jun 2023 15:25:52 +0000 Subject: [PATCH 26/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index 9ce033436..33caed917 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -20,7 +20,7 @@ charset-normalizer==3.1.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib cryptography==41.0.1 # via pyjwt From dbec08643819669b9cabbeab88d3a79b005b6395 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 15 Jun 2023 15:25:52 +0000 Subject: [PATCH 27/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index be6747720..048313459 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -18,7 +18,7 @@ charset-normalizer==3.1.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib cryptography==41.0.1 # via pyjwt From d659c6ba8dba1a65701f97c76ed08dba6300c693 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 15 Jun 2023 15:25:52 +0000 Subject: [PATCH 28/93] update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 8a2945469..f70ce6efc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -18,7 +18,7 @@ charset-normalizer==3.1.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools -contourpy==1.0.7 +contourpy==1.1.0 # via matplotlib cryptography==41.0.1 # via pyjwt From 54ecf211b33edfb14cc6ea838f0530f1e8a93c54 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 7 Jul 2023 22:04:48 +0000 Subject: [PATCH 29/93] update requirements-all.txt --- requirements-all.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index da3141241..3cc0a86eb 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=all --output-file=requirements-all.txt # -astropy==5.3 +astropy==5.3.1 # via # healpy # icecube-skyreader @@ -16,7 +16,7 @@ certifi==2023.5.7 # requests cffi==1.15.1 # via cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools @@ -48,7 +48,7 @@ iminuit==2.22.0 # via skymap-scanner (setup.py) kiwisolver==1.4.4 # via matplotlib -matplotlib==3.7.1 +matplotlib==3.7.2 # via # healpy # icecube-skyreader @@ -70,7 +70,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[all]==2.1.0 +oms-mqclient[all]==2.1.1 # via # ewms-pilot # skymap-scanner (setup.py) @@ -84,7 +84,7 @@ pika==1.3.2 # via oms-mqclient pillow==10.0.0 # via matplotlib -pulsar-client==3.2.0 +pulsar-client==3.1.0 # via oms-mqclient pycparser==2.21 # via cffi @@ -92,7 +92,7 @@ pyerfa==2.0.0.3 # via astropy pyjwt[crypto]==2.7.0 # via wipac-rest-tools -pyparsing==3.1.0 +pyparsing==3.0.9 # via matplotlib pypng==0.20220715.0 # via qrcode From 0ab23299c97add4f3618e8d25b9bfcca254cfefd Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 7 Jul 2023 22:04:48 +0000 Subject: [PATCH 30/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index d2889293b..5889033c1 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=client-starter --output-file=requirements-client-starter.txt # -astropy==5.3 +astropy==5.3.1 # via # healpy # icecube-skyreader @@ -14,7 +14,7 @@ certifi==2023.5.7 # via requests cffi==1.15.1 # via cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools @@ -46,7 +46,7 @@ iminuit==2.22.0 # via skymap-scanner (setup.py) kiwisolver==1.4.4 # via matplotlib -matplotlib==3.7.1 +matplotlib==3.7.2 # via # healpy # icecube-skyreader @@ -64,7 +64,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient==2.1.0 +oms-mqclient==2.1.1 # via # ewms-pilot # skymap-scanner (setup.py) @@ -82,7 +82,7 @@ pyerfa==2.0.0.3 # via astropy pyjwt[crypto]==2.7.0 # via wipac-rest-tools -pyparsing==3.1.0 +pyparsing==3.0.9 # via matplotlib pypng==0.20220715.0 # via qrcode From fe52c9a5ef7c3cf20cee572c3219d3b8651e34f4 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 7 Jul 2023 22:04:48 +0000 Subject: [PATCH 31/93] update requirements-nats.txt --- requirements-nats.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index c5dcf0022..002141ffc 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=nats --output-file=requirements-nats.txt # -astropy==5.3 +astropy==5.3.1 # via # healpy # icecube-skyreader @@ -14,7 +14,7 @@ certifi==2023.5.7 # via requests cffi==1.15.1 # via cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools @@ -46,7 +46,7 @@ iminuit==2.22.0 # via skymap-scanner (setup.py) kiwisolver==1.4.4 # via matplotlib -matplotlib==3.7.1 +matplotlib==3.7.2 # via # healpy # icecube-skyreader @@ -68,7 +68,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[nats]==2.1.0 +oms-mqclient[nats]==2.1.1 # via # ewms-pilot # skymap-scanner (setup.py) @@ -86,7 +86,7 @@ pyerfa==2.0.0.3 # via astropy pyjwt[crypto]==2.7.0 # via wipac-rest-tools -pyparsing==3.1.0 +pyparsing==3.0.9 # via matplotlib pypng==0.20220715.0 # via qrcode From c8fda074600e2430cf8606f0affad4d042a754d6 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 7 Jul 2023 22:04:48 +0000 Subject: [PATCH 32/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index 97488592d..bb56b128f 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=pulsar --output-file=requirements-pulsar.txt # -astropy==5.3 +astropy==5.3.1 # via # healpy # icecube-skyreader @@ -16,7 +16,7 @@ certifi==2023.5.7 # requests cffi==1.15.1 # via cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools @@ -46,7 +46,7 @@ iminuit==2.22.0 # via skymap-scanner (setup.py) kiwisolver==1.4.4 # via matplotlib -matplotlib==3.7.1 +matplotlib==3.7.2 # via # healpy # icecube-skyreader @@ -64,7 +64,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[pulsar]==2.1.0 +oms-mqclient[pulsar]==2.1.1 # via # ewms-pilot # skymap-scanner (setup.py) @@ -76,7 +76,7 @@ pandas==2.0.3 # via icecube-skyreader pillow==10.0.0 # via matplotlib -pulsar-client==3.2.0 +pulsar-client==3.1.0 # via oms-mqclient pycparser==2.21 # via cffi @@ -84,7 +84,7 @@ pyerfa==2.0.0.3 # via astropy pyjwt[crypto]==2.7.0 # via wipac-rest-tools -pyparsing==3.1.0 +pyparsing==3.0.9 # via matplotlib pypng==0.20220715.0 # via qrcode From e7f55d4467a50823f4ca3898cf50015f8cc898ea Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 7 Jul 2023 22:04:48 +0000 Subject: [PATCH 33/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index ae7f87907..31b800a05 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -4,7 +4,7 @@ # # pip-compile --extra=rabbitmq --output-file=requirements-rabbitmq.txt # -astropy==5.3 +astropy==5.3.1 # via # healpy # icecube-skyreader @@ -14,7 +14,7 @@ certifi==2023.5.7 # via requests cffi==1.15.1 # via cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools @@ -44,7 +44,7 @@ iminuit==2.22.0 # via skymap-scanner (setup.py) kiwisolver==1.4.4 # via matplotlib -matplotlib==3.7.1 +matplotlib==3.7.2 # via # healpy # icecube-skyreader @@ -62,7 +62,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[rabbitmq]==2.1.0 +oms-mqclient[rabbitmq]==2.1.1 # via # ewms-pilot # skymap-scanner (setup.py) @@ -82,7 +82,7 @@ pyerfa==2.0.0.3 # via astropy pyjwt[crypto]==2.7.0 # via wipac-rest-tools -pyparsing==3.1.0 +pyparsing==3.0.9 # via matplotlib pypng==0.20220715.0 # via qrcode From c924bca5f5626d0fedab6dcb9c1fa724877899ff Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 7 Jul 2023 22:04:48 +0000 Subject: [PATCH 34/93] update requirements.txt --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8e65a9375..363c98380 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ # # pip-compile --output-file=requirements.txt # -astropy==5.3 +astropy==5.3.1 # via # healpy # icecube-skyreader @@ -14,7 +14,7 @@ certifi==2023.5.7 # via requests cffi==1.15.1 # via cryptography -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests coloredlogs==15.0.1 # via wipac-dev-tools @@ -44,7 +44,7 @@ iminuit==2.22.0 # via skymap-scanner (setup.py) kiwisolver==1.4.4 # via matplotlib -matplotlib==3.7.1 +matplotlib==3.7.2 # via # healpy # icecube-skyreader @@ -62,7 +62,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient==2.1.0 +oms-mqclient==2.1.1 # via # ewms-pilot # skymap-scanner (setup.py) @@ -80,7 +80,7 @@ pyerfa==2.0.0.3 # via astropy pyjwt[crypto]==2.7.0 # via wipac-rest-tools -pyparsing==3.1.0 +pyparsing==3.0.9 # via matplotlib pypng==0.20220715.0 # via qrcode From 9f9e4537dea0db79437168d15d91e3ab94fb7e35 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 8 Jun 2023 13:40:04 -0700 Subject: [PATCH 35/93] CI: flip matrix order --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 09eff9c51..1f8fccf49 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -265,6 +265,10 @@ jobs: strategy: fail-fast: false matrix: + ewms_pilot_concurrent_tasks: [ + 0, + 3, + ] eventfile: [ hese_event_01.json, run00136766-evt000007637140-GOLD.pkl, @@ -275,10 +279,6 @@ jobs: millipede_wilks, # splinempe ] - ewms_pilot_concurrent_tasks: [ - 0, - 3, - ] env: CLIENTS_PER_CPU: 1 # there isn't any improvement when >1 SKYSCAN_BROKER_ADDRESS: user1@localhost/test From d23afa91100dad00448e126ea9026da1e5307ade Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 17 Jul 2023 23:19:26 +0000 Subject: [PATCH 36/93] update requirements-all.txt --- requirements-all.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index 3cc0a86eb..c0991b18b 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -22,15 +22,15 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.1.0 # via matplotlib -cryptography==41.0.1 +cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib ed25519==1.5 # via nkeys -ewms-pilot==0.10.3 +ewms-pilot==0.11.0 # via skymap-scanner (setup.py) -fonttools==4.40.0 +fonttools==4.41.0 # via matplotlib healpy==1.16.3 # via @@ -40,7 +40,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.2.0 +icecube-skyreader==1.2.2 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -58,7 +58,7 @@ nats-py[nkeys]==2.3.1 # via oms-mqclient nkeys==0.1.0 # via nats-py -numpy==1.25.0 +numpy==1.25.1 # via # astropy # contourpy @@ -70,7 +70,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[all]==2.1.1 +oms-mqclient[all]==2.3.2 # via # ewms-pilot # skymap-scanner (setup.py) From 1b2417eab0ef5262a16f1334395683c2e43e75a7 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 17 Jul 2023 23:19:26 +0000 Subject: [PATCH 37/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 5889033c1..1f0ccb04a 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -20,13 +20,13 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.1.0 # via matplotlib -cryptography==41.0.1 +cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.3 +ewms-pilot==0.11.0 # via skymap-scanner (setup.py) -fonttools==4.40.0 +fonttools==4.41.0 # via matplotlib healpy==1.16.3 # via @@ -38,7 +38,7 @@ htcondor==10.6.0 # via skymap-scanner (setup.py) humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.2.0 +icecube-skyreader==1.2.2 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -52,7 +52,7 @@ matplotlib==3.7.2 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -numpy==1.25.0 +numpy==1.25.1 # via # astropy # contourpy @@ -64,7 +64,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient==2.1.1 +oms-mqclient==2.3.2 # via # ewms-pilot # skymap-scanner (setup.py) From 4ff39d78143d1d864469fa9365399093b444b4d0 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 17 Jul 2023 23:19:26 +0000 Subject: [PATCH 38/93] update requirements-nats.txt --- requirements-nats.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index 002141ffc..cef1a9685 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -20,15 +20,15 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.1.0 # via matplotlib -cryptography==41.0.1 +cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib ed25519==1.5 # via nkeys -ewms-pilot==0.10.3 +ewms-pilot==0.11.0 # via skymap-scanner (setup.py) -fonttools==4.40.0 +fonttools==4.41.0 # via matplotlib healpy==1.16.3 # via @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.2.0 +icecube-skyreader==1.2.2 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -56,7 +56,7 @@ nats-py[nkeys]==2.3.1 # via oms-mqclient nkeys==0.1.0 # via nats-py -numpy==1.25.0 +numpy==1.25.1 # via # astropy # contourpy @@ -68,7 +68,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[nats]==2.1.1 +oms-mqclient[nats]==2.3.2 # via # ewms-pilot # skymap-scanner (setup.py) From 6f19e100a9aa51ddba8bf4d2218185ecb706e188 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 17 Jul 2023 23:19:26 +0000 Subject: [PATCH 39/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index bb56b128f..e602bcee2 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -22,13 +22,13 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.1.0 # via matplotlib -cryptography==41.0.1 +cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.3 +ewms-pilot==0.11.0 # via skymap-scanner (setup.py) -fonttools==4.40.0 +fonttools==4.41.0 # via matplotlib healpy==1.16.3 # via @@ -38,7 +38,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.2.0 +icecube-skyreader==1.2.2 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -52,7 +52,7 @@ matplotlib==3.7.2 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -numpy==1.25.0 +numpy==1.25.1 # via # astropy # contourpy @@ -64,7 +64,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[pulsar]==2.1.1 +oms-mqclient[pulsar]==2.3.2 # via # ewms-pilot # skymap-scanner (setup.py) From f0952633b5183e6f4976d775f28f083b342b4669 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 17 Jul 2023 23:19:26 +0000 Subject: [PATCH 40/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index 31b800a05..cd3667803 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -20,13 +20,13 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.1.0 # via matplotlib -cryptography==41.0.1 +cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.3 +ewms-pilot==0.11.0 # via skymap-scanner (setup.py) -fonttools==4.40.0 +fonttools==4.41.0 # via matplotlib healpy==1.16.3 # via @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.2.0 +icecube-skyreader==1.2.2 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -50,7 +50,7 @@ matplotlib==3.7.2 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -numpy==1.25.0 +numpy==1.25.1 # via # astropy # contourpy @@ -62,7 +62,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient[rabbitmq]==2.1.1 +oms-mqclient[rabbitmq]==2.3.2 # via # ewms-pilot # skymap-scanner (setup.py) From 1e8a24efc069aa5760167bdfde894b89c6fec0c3 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 17 Jul 2023 23:19:26 +0000 Subject: [PATCH 41/93] update requirements.txt --- requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 363c98380..7a1daad1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,13 +20,13 @@ coloredlogs==15.0.1 # via wipac-dev-tools contourpy==1.1.0 # via matplotlib -cryptography==41.0.1 +cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.10.3 +ewms-pilot==0.11.0 # via skymap-scanner (setup.py) -fonttools==4.40.0 +fonttools==4.41.0 # via matplotlib healpy==1.16.3 # via @@ -36,7 +36,7 @@ htchirp==2.0 # via ewms-pilot humanfriendly==10.0 # via coloredlogs -icecube-skyreader==1.2.0 +icecube-skyreader==1.2.2 # via skymap-scanner (setup.py) idna==3.4 # via requests @@ -50,7 +50,7 @@ matplotlib==3.7.2 # icecube-skyreader meander==0.0.3 # via icecube-skyreader -numpy==1.25.0 +numpy==1.25.1 # via # astropy # contourpy @@ -62,7 +62,7 @@ numpy==1.25.0 # pyerfa # scipy # skymap-scanner (setup.py) -oms-mqclient==2.1.1 +oms-mqclient==2.3.2 # via # ewms-pilot # skymap-scanner (setup.py) From e3dba8ab15b8c6ab4958086834cdfa0863fd3593 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 17 Jul 2023 16:29:33 -0700 Subject: [PATCH 42/93] fix `test-build-docker-pulsar` --- .github/workflows/tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1f8fccf49..053df4708 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -51,6 +51,10 @@ jobs: needs: test-build-docker runs-on: ubuntu-latest steps: + - uses: jlumbroso/free-disk-space@main + with: + tool-cache: 'true' + large-packages: false # TODO: remove once https://github.com/jlumbroso/free-disk-space/issues/4 is fixed - uses: actions/checkout@v3 - uses: docker/setup-buildx-action@v2 - uses: docker/build-push-action@v3 From 4eedeb27d371c47766353bd92a11a8935b34c7e8 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 18 Jul 2023 16:44:07 +0000 Subject: [PATCH 43/93] update requirements-all.txt --- requirements-all.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-all.txt b/requirements-all.txt index c0991b18b..4bc425830 100644 --- a/requirements-all.txt +++ b/requirements-all.txt @@ -28,7 +28,7 @@ cycler==0.11.0 # via matplotlib ed25519==1.5 # via nkeys -ewms-pilot==0.11.0 +ewms-pilot==0.11.1 # via skymap-scanner (setup.py) fonttools==4.41.0 # via matplotlib @@ -102,7 +102,7 @@ python-dateutil==2.8.2 # pandas pytz==2023.3 # via pandas -pyyaml==6.0 +pyyaml==6.0.1 # via astropy qrcode==7.4.2 # via wipac-rest-tools From 27128f7cc5a535f99dc969a09c018e5855b2d75d Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 18 Jul 2023 16:44:07 +0000 Subject: [PATCH 44/93] update requirements-client-starter.txt --- requirements-client-starter.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-client-starter.txt b/requirements-client-starter.txt index 1f0ccb04a..afe968a2b 100644 --- a/requirements-client-starter.txt +++ b/requirements-client-starter.txt @@ -24,7 +24,7 @@ cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.11.0 +ewms-pilot==0.11.1 # via skymap-scanner (setup.py) fonttools==4.41.0 # via matplotlib @@ -92,7 +92,7 @@ python-dateutil==2.8.2 # pandas pytz==2023.3 # via pandas -pyyaml==6.0 +pyyaml==6.0.1 # via astropy qrcode==7.4.2 # via wipac-rest-tools From 14ccbf944f8691642fa3ef01bfa4ecd40486bf21 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 18 Jul 2023 16:44:07 +0000 Subject: [PATCH 45/93] update requirements-nats.txt --- requirements-nats.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-nats.txt b/requirements-nats.txt index cef1a9685..92364d6b5 100644 --- a/requirements-nats.txt +++ b/requirements-nats.txt @@ -26,7 +26,7 @@ cycler==0.11.0 # via matplotlib ed25519==1.5 # via nkeys -ewms-pilot==0.11.0 +ewms-pilot==0.11.1 # via skymap-scanner (setup.py) fonttools==4.41.0 # via matplotlib @@ -96,7 +96,7 @@ python-dateutil==2.8.2 # pandas pytz==2023.3 # via pandas -pyyaml==6.0 +pyyaml==6.0.1 # via astropy qrcode==7.4.2 # via wipac-rest-tools From 90c71712c2c907a61a96072079e8739201e8aa49 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 18 Jul 2023 16:44:07 +0000 Subject: [PATCH 46/93] update requirements-pulsar.txt --- requirements-pulsar.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-pulsar.txt b/requirements-pulsar.txt index e602bcee2..2e8651123 100644 --- a/requirements-pulsar.txt +++ b/requirements-pulsar.txt @@ -26,7 +26,7 @@ cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.11.0 +ewms-pilot==0.11.1 # via skymap-scanner (setup.py) fonttools==4.41.0 # via matplotlib @@ -94,7 +94,7 @@ python-dateutil==2.8.2 # pandas pytz==2023.3 # via pandas -pyyaml==6.0 +pyyaml==6.0.1 # via astropy qrcode==7.4.2 # via wipac-rest-tools From 475f3ee1b846ffb054f4bccffd1f1e0e0de3b0f6 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 18 Jul 2023 16:44:07 +0000 Subject: [PATCH 47/93] update requirements-rabbitmq.txt --- requirements-rabbitmq.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements-rabbitmq.txt b/requirements-rabbitmq.txt index cd3667803..740ed7f40 100644 --- a/requirements-rabbitmq.txt +++ b/requirements-rabbitmq.txt @@ -24,7 +24,7 @@ cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.11.0 +ewms-pilot==0.11.1 # via skymap-scanner (setup.py) fonttools==4.41.0 # via matplotlib @@ -92,7 +92,7 @@ python-dateutil==2.8.2 # pandas pytz==2023.3 # via pandas -pyyaml==6.0 +pyyaml==6.0.1 # via astropy qrcode==7.4.2 # via wipac-rest-tools From 7a2aa3607432b828e9a672e0c5c458a919e23563 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 18 Jul 2023 16:44:07 +0000 Subject: [PATCH 48/93] update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7a1daad1a..bfef5999f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ cryptography==41.0.2 # via pyjwt cycler==0.11.0 # via matplotlib -ewms-pilot==0.11.0 +ewms-pilot==0.11.1 # via skymap-scanner (setup.py) fonttools==4.41.0 # via matplotlib @@ -90,7 +90,7 @@ python-dateutil==2.8.2 # pandas pytz==2023.3 # via pandas -pyyaml==6.0 +pyyaml==6.0.1 # via astropy qrcode==7.4.2 # via wipac-rest-tools From 12d83e96ee0b8a8a196f33a7a7eb3bf39af7269b Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 11 Sep 2023 15:24:37 -0500 Subject: [PATCH 49/93] add back multitasking ci --- .github/workflows/tests.yml | 9 +++++++++ resources/launch_scripts/local-scan.sh | 3 +++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 13ed7daad..b3581f460 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -310,6 +310,10 @@ jobs: run00136766-evt000007637140-GOLD.pkl, run00136662-evt000035405932-BRONZE.pkl ] + ewms_pilot_concurrent_tasks: [ + 0, + 3, + ] exclude: # splinempe should not run on HESE - reco_algo: splinempe @@ -356,9 +360,14 @@ jobs: export _EVENTS_FILE=$(realpath $REALTIME_EVENTS_DIR/${{ matrix.eventfile }}) export _NSIDES="1:0" + export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + free # dump memory stats + cd ./resources/launch_scripts ./local-scan.sh + free # dump memory stats + - name: test output against known result (.npz/.json) run: | if [[ ${{ matrix.reco_algo }} == 'millipede_wilks' ]]; then diff --git a/resources/launch_scripts/local-scan.sh b/resources/launch_scripts/local-scan.sh index e064d5121..6679b6656 100755 --- a/resources/launch_scripts/local-scan.sh +++ b/resources/launch_scripts/local-scan.sh @@ -61,6 +61,9 @@ for i in $( seq 1 $nclients ); do done +free -c 6 -s 10 # dump memory stats for 1 min + + # Wait for Everyone wait -n # for server for i in $( seq 1 $nclients ); do From a0031a1e124dcff204ee9b5de11e873b363b1820 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 11 Sep 2023 20:44:15 +0000 Subject: [PATCH 50/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 4 ++-- dependencies-from-Dockerfile_no_cvmfs.log | 6 +++--- dependencies-from-Dockerfile_pulsar.log | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index 2edd547dc..3d6d108a1 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -110,13 +110,13 @@ six==1.16.0 snowballstemmer==2.2.0 sortedcontainers==2.1.0 soupsieve==2.3.1 -Sphinx==7.2.1 +Sphinx==7.2.5 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-devhelp==1.0.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 -sphinxcontrib-serializinghtml==1.1.8 +sphinxcontrib-serializinghtml==1.1.9 sympy==1.9 tables==3.7.0 toml==0.10.2 diff --git a/dependencies-from-Dockerfile_no_cvmfs.log b/dependencies-from-Dockerfile_no_cvmfs.log index 262eb663d..2edd547dc 100644 --- a/dependencies-from-Dockerfile_no_cvmfs.log +++ b/dependencies-from-Dockerfile_no_cvmfs.log @@ -125,12 +125,12 @@ traitlets==5.1.1 typing_extensions==4.7.1 ufoLib2==0.13.1 unicodedata2==14.0.0 -UNKNOWN==3.14.0 -urllib3==1.26.5 +UNKNOWN @ file:///root/nuflux-2.0.4 +urllib3==2.0.4 urwid==2.1.2 wcwidth==0.2.5 webencodings==0.5.1 wipac-dev-tools==1.6.16 -wipac-rest-tools==1.5.2 +wipac-rest-tools==1.5.3 xlwt==1.3.0 zipp==1.0.0 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index aa6ba7535..570f0f526 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -110,13 +110,13 @@ six==1.16.0 snowballstemmer==2.2.0 sortedcontainers==2.1.0 soupsieve==2.3.1 -Sphinx==7.2.1 +Sphinx==7.2.5 sphinxcontrib-applehelp==1.0.7 sphinxcontrib-devhelp==1.0.5 sphinxcontrib-htmlhelp==2.0.4 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.6 -sphinxcontrib-serializinghtml==1.1.8 +sphinxcontrib-serializinghtml==1.1.9 sympy==1.9 tables==3.7.0 toml==0.10.2 From a17a71f28555080d40b661ce389943cf830fb17a Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 11 Sep 2023 15:56:19 -0500 Subject: [PATCH 51/93] move reco-algo to startup.json from message for memory pre-loading --- skymap_scanner/client/client.py | 1 + skymap_scanner/client/reco_icetray.py | 10 +++++++--- skymap_scanner/config.py | 1 - skymap_scanner/server/start_scan.py | 8 +++----- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/skymap_scanner/client/client.py b/skymap_scanner/client/client.py index c0130f911..73e5c19f3 100644 --- a/skymap_scanner/client/client.py +++ b/skymap_scanner/client/client.py @@ -74,6 +74,7 @@ def main() -> None: " --out-pkl {{OUTFILE}}" # ^^^ " --gcdqp-packet-json GCDQp_packet.json" f" --baseline-gcd-file {startup_json_dict['baseline_GCD_file']}" + f" --reco-algo {startup_json_dict['reco_algo']}" ) # go! diff --git a/skymap_scanner/client/reco_icetray.py b/skymap_scanner/client/reco_icetray.py index b2ef4f0c8..f0205b545 100644 --- a/skymap_scanner/client/reco_icetray.py +++ b/skymap_scanner/client/reco_icetray.py @@ -241,7 +241,12 @@ def main() -> None: ), ) - # extra "physics" args + # "physics" args + parser.add_argument( + "--reco-algo", + choices=recos.get_all_reco_algos(), + help="The reconstruction algorithm to use", + ) parser.add_argument( "--gcdqp-packet-json", dest="GCDQp_packet_json", @@ -277,7 +282,6 @@ def main() -> None: # get PFrame with open(args.in_pkl, "rb") as f: msg = pickle.load(f) - reco_algo = msg[cfg.MSG_KEY_RECO_ALGO] pframe = msg[cfg.MSG_KEY_PFRAME] # get GCDQp_packet @@ -288,7 +292,7 @@ def main() -> None: # go! reco_pixel( - reco_algo, + args.reco_algo, pframe, GCDQp_packet, str(args.baseline_GCD_file), diff --git a/skymap_scanner/config.py b/skymap_scanner/config.py index 236c3e483..c8fe5420c 100644 --- a/skymap_scanner/config.py +++ b/skymap_scanner/config.py @@ -44,7 +44,6 @@ STATEDICT_BASELINE_GCD_FILE: Final = "baseline_GCD_file" STATEDICT_NSIDES: Final = "nsides" # -MSG_KEY_RECO_ALGO: Final = "reco_algo" MSG_KEY_PFRAME: Final = "pframe" BASELINE_GCD_FILENAME = "base_GCD_for_diff.i3" diff --git a/skymap_scanner/server/start_scan.py b/skymap_scanner/server/start_scan.py index c99659c7a..e812c8573 100644 --- a/skymap_scanner/server/start_scan.py +++ b/skymap_scanner/server/start_scan.py @@ -358,7 +358,6 @@ async def scan( total_n_pixfin = await _serve_and_collect( to_clients_queue, from_clients_queue, - reco_algo, nsides_dict, pixeler, reporter, @@ -378,7 +377,6 @@ async def scan( async def _send_pixels( to_clients_queue: mq.Queue, - reco_algo: str, pixeler: PixelsToReco, already_sent_pixvars: Set[SentPixelVariation], nside_subprogression: NSideProgression, @@ -394,7 +392,6 @@ async def _send_pixels( LOGGER.info(f"Sending message M#{i} {pframe_tuple(pframe)}...") await pub.send( { - cfg.MSG_KEY_RECO_ALGO: reco_algo, cfg.MSG_KEY_PFRAME: pframe, } ) @@ -411,7 +408,6 @@ async def _send_pixels( async def _serve_and_collect( to_clients_queue: mq.Queue, from_clients_queue: mq.Queue, - reco_algo: str, nsides_dict: NSidesDict, pixeler: PixelsToReco, reporter: Reporter, @@ -440,7 +436,6 @@ async def _serve_and_collect( # sent_pixvars = await _send_pixels( to_clients_queue, - reco_algo, pixeler, collector.sent_pixvars, # we want to open re-refinement for all nsides <= max_nside_thresholded @@ -508,6 +503,7 @@ def write_startup_json( nside_progression: NSideProgression, baseline_GCD_file: str, GCDQp_packet: List[icetray.I3Frame], + reco_algo: str, ) -> str: """Write startup JSON file for client-spawning. @@ -531,6 +527,7 @@ def write_startup_json( GCDQp_packet, pnf_framing=False ) ), + "reco_algo": reco_algo, } with open(client_startup_json, "w") as f: @@ -711,6 +708,7 @@ def _nside_and_pixelextension(val: str) -> Tuple[int, int]: args.nside_progression, state_dict[cfg.STATEDICT_BASELINE_GCD_FILE], state_dict[cfg.STATEDICT_GCDQP_PACKET], + args.reco_algo, ) # make mq connections From e7a3b3e69b4b5d7b0eefc3e84e01785599076edc Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 20 Sep 2023 18:01:20 -0500 Subject: [PATCH 52/93] don't pin mq packages --- setup.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index ca115999b..18fc5ca9f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -18,12 +18,12 @@ branch = main [options] # generated by wipac:cicd_setup_builder: python_requires, packages install_requires = - ewms-pilot==0.12.2 # the extras here are the same as 'oms-mqclient', so just define one place + ewms-pilot # the extras here are the same as 'oms-mqclient', so just define one place healpy icecube-skyreader iminuit numpy - oms-mqclient==2.4.4 + oms-mqclient wipac-dev-tools[coloredlogs] wipac-rest-tools python_requires = >=3.9, <3.12 From b7270bf1f6356ab8103059388b6493780ce9d63c Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 20 Sep 2023 23:32:39 +0000 Subject: [PATCH 53/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 2 +- dependencies-from-Dockerfile_pulsar.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index e4ac46835..644f3ef98 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -126,7 +126,7 @@ typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 -urllib3==2.0.4 +urllib3==2.0.5 urwid==2.1.2 wcwidth==0.2.5 webencodings==0.5.1 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index c5d2f4583..52fdf8ad0 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -126,7 +126,7 @@ typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 -urllib3==2.0.4 +urllib3==2.0.5 urwid==2.1.2 wcwidth==0.2.5 webencodings==0.5.1 From 2bb64ca1f7cdeccc7d97c9d3e298661299428a17 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 21 Sep 2023 16:18:42 +0000 Subject: [PATCH 54/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 4 ++-- dependencies-from-Dockerfile_pulsar.log | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index 644f3ef98..0d976e0b3 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.2 +ewms-pilot==0.12.3 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 @@ -64,7 +64,7 @@ numexpr==2.8.1 numpy==1.21.5 odfpy==1.4.2 olefile==0.46 -oms-mqclient==2.4.4 +oms-mqclient==2.4.6 openpyxl==3.0.9 packaging==21.3 pandas==1.3.5 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index 52fdf8ad0..de5d1a8d0 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.2 +ewms-pilot==0.12.3 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 @@ -63,7 +63,7 @@ numexpr==2.8.1 numpy==1.21.5 odfpy==1.4.2 olefile==0.46 -oms-mqclient==2.4.4 +oms-mqclient==2.4.6 openpyxl==3.0.9 packaging==21.3 pandas==1.3.5 From 000757d8621d547c026a7cd79f95bb77fa56412c Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 21 Sep 2023 14:20:49 -0500 Subject: [PATCH 55/93] add `reco_algo` to test data --- .../data/reco_pixel_pkls/millipede_original/BRONZE/startup.json | 1 + tests/data/reco_pixel_pkls/millipede_original/GOLD/startup.json | 1 + tests/data/reco_pixel_pkls/millipede_original/JSON/startup.json | 1 + tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/startup.json | 1 + tests/data/reco_pixel_pkls/millipede_wilks/GOLD/startup.json | 1 + tests/data/reco_pixel_pkls/millipede_wilks/JSON/startup.json | 1 + tests/data/reco_pixel_pkls/splinempe/BRONZE/startup.json | 1 + tests/data/reco_pixel_pkls/splinempe/GOLD/startup.json | 1 + 8 files changed, 8 insertions(+) diff --git a/tests/data/reco_pixel_pkls/millipede_original/BRONZE/startup.json b/tests/data/reco_pixel_pkls/millipede_original/BRONZE/startup.json index 1064b57f0..2c6bf1028 100644 --- a/tests/data/reco_pixel_pkls/millipede_original/BRONZE/startup.json +++ b/tests/data/reco_pixel_pkls/millipede_original/BRONZE/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "millipede_original", "mq_basename": "run00136662.evt000035405932.HESE-1-1", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/baseline_gcd_135417.i3", "GCDQp_packet": { diff --git a/tests/data/reco_pixel_pkls/millipede_original/GOLD/startup.json b/tests/data/reco_pixel_pkls/millipede_original/GOLD/startup.json index cf860c045..cc21a3193 100644 --- a/tests/data/reco_pixel_pkls/millipede_original/GOLD/startup.json +++ b/tests/data/reco_pixel_pkls/millipede_original/GOLD/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "millipede_original", "mq_basename": "run00136766.evt000007637140.HESE-1-1", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/baseline_gcd_135417.i3", "GCDQp_packet": { diff --git a/tests/data/reco_pixel_pkls/millipede_original/JSON/startup.json b/tests/data/reco_pixel_pkls/millipede_original/JSON/startup.json index 0bb64909e..715dcdcf9 100644 --- a/tests/data/reco_pixel_pkls/millipede_original/JSON/startup.json +++ b/tests/data/reco_pixel_pkls/millipede_original/JSON/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "millipede_original", "mq_basename": "run00127907.evt000020178442.HESE-1-1", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/2016_01_08_Run127381.i3", "GCDQp_packet": { diff --git a/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/startup.json b/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/startup.json index 93a391290..592181a7d 100644 --- a/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/startup.json +++ b/tests/data/reco_pixel_pkls/millipede_wilks/BRONZE/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "millipede_wilks", "scan_id": "35405932-1:0-1684764148", "mq_basename": "35405932-1:0-1684764148", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/baseline_gcd_135417.i3", diff --git a/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/startup.json b/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/startup.json index 40d57cb72..758df3e93 100644 --- a/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/startup.json +++ b/tests/data/reco_pixel_pkls/millipede_wilks/GOLD/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "millipede_wilks", "scan_id": "7637140-1:0-1684845570", "mq_basename": "7637140-1:0-1684845570", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/baseline_gcd_135417.i3", diff --git a/tests/data/reco_pixel_pkls/millipede_wilks/JSON/startup.json b/tests/data/reco_pixel_pkls/millipede_wilks/JSON/startup.json index a1564b058..5cb92db1c 100644 --- a/tests/data/reco_pixel_pkls/millipede_wilks/JSON/startup.json +++ b/tests/data/reco_pixel_pkls/millipede_wilks/JSON/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "millipede_wilks", "scan_id": "20178442-1:0-1684859396", "mq_basename": "20178442-1:0-1684859396", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/2016_01_08_Run127381.i3", diff --git a/tests/data/reco_pixel_pkls/splinempe/BRONZE/startup.json b/tests/data/reco_pixel_pkls/splinempe/BRONZE/startup.json index 34a453a26..63ad583a1 100644 --- a/tests/data/reco_pixel_pkls/splinempe/BRONZE/startup.json +++ b/tests/data/reco_pixel_pkls/splinempe/BRONZE/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "splinempe", "scan_id": "35405932-1:0-1689867940", "mq_basename": "35405932-1:0-1689867940", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/baseline_gcd_135417.i3", diff --git a/tests/data/reco_pixel_pkls/splinempe/GOLD/startup.json b/tests/data/reco_pixel_pkls/splinempe/GOLD/startup.json index 6446dcebb..4b073f4d7 100644 --- a/tests/data/reco_pixel_pkls/splinempe/GOLD/startup.json +++ b/tests/data/reco_pixel_pkls/splinempe/GOLD/startup.json @@ -1,4 +1,5 @@ { + "reco_algo": "splinempe", "scan_id": "7637140-1:0-1689846722", "mq_basename": "7637140-1:0-1689846722", "baseline_GCD_file": "/opt/i3-data/baseline_gcds/baseline_gcd_135417.i3", From 81e6aeda3c8218949385e3a8a8b9ac8aa53e04c4 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 21 Sep 2023 14:27:00 -0500 Subject: [PATCH 56/93] add back `ewms_pilot_concurrent_tasks` --- .github/workflows/tests.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9a1307ab3..f68673e97 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -310,11 +310,14 @@ jobs: run00136766-evt000007637140-GOLD.pkl, run00136662-evt000035405932-BRONZE.pkl ] + ewms_pilot_concurrent_tasks: [ + 0, + 3, + ] exclude: # splinempe should not run on HESE - reco_algo: splinempe eventfile: hese_event_01.json - env: _CLIENTS_PER_CPU: 1 # there isn't any improvement when >1 SKYSCAN_BROKER_ADDRESS: user1@localhost/test @@ -363,9 +366,14 @@ jobs: export _EVENTS_FILE=$(realpath $REALTIME_EVENTS_DIR/${{ matrix.eventfile }}) export _NSIDES="1:0" + export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + free # dump memory stats + cd ./resources/launch_scripts ./local-scan.sh + free # dump memory stats + - name: test output against known result (.json) run: | ls $SKYSCAN_OUTPUT_DIR From 9d982a634d2a9d3656a609dd02b787d9d4a0e642 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 21 Sep 2023 14:33:05 -0500 Subject: [PATCH 57/93] add missing `--reco-algo` to single-pixel test & make required --- .github/workflows/tests.yml | 1 + skymap_scanner/client/reco_icetray.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index f68673e97..271df9869 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -479,6 +479,7 @@ jobs: icecube/skymap_scanner:local \ python -m skymap_scanner.client.reco_icetray \ --in-pkl /local/pkls/in.pkl \ + --reco-algo ${{ matrix.reco_algo }} \ --gcdqp-packet-json /local/pkls/GCDQp_packet.json \ --baseline-gcd-file $(jq -r '.baseline_GCD_file' tests/data/reco_pixel_pkls/${{ matrix.reco_algo }}/${{ matrix.dir }}/startup.json) \ --out-pkl /local/pkls/out.pkl diff --git a/skymap_scanner/client/reco_icetray.py b/skymap_scanner/client/reco_icetray.py index d7a791a19..edd5dc02b 100644 --- a/skymap_scanner/client/reco_icetray.py +++ b/skymap_scanner/client/reco_icetray.py @@ -11,7 +11,6 @@ from pathlib import Path from typing import Any, List, Union -from icecube.icetray import I3Tray # type: ignore[import] from icecube import ( # type: ignore[import] # noqa: F401 dataio, frame_object_diff, @@ -20,6 +19,7 @@ photonics_service, ) from icecube.frame_object_diff.segments import uncompress # type: ignore[import] +from icecube.icetray import I3Tray # type: ignore[import] from wipac_dev_tools import argparse_tools, logging_tools from .. import config as cfg @@ -244,6 +244,7 @@ def main() -> None: # "physics" args parser.add_argument( "--reco-algo", + required=True, choices=recos.get_all_reco_algos(), help="The reconstruction algorithm to use", ) From cd07ab2fabdaaadae2e0b09e53183a9515791d6c Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 21 Sep 2023 17:20:59 -0500 Subject: [PATCH 58/93] dump reco-icetray logs --- .github/workflows/tests.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 271df9869..c01d464aa 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -289,6 +289,13 @@ jobs: nsides = "${{ matrix.nsides }}" assert len(pydict) == nsides.count(":") ' + + - name: reco-icetray logs + if: always() + run: | + tree $SKYSCAN_DEBUG_DIR | ls -R $SKYSCAN_DEBUG_DIR + find $SKYSCAN_DEBUG_DIR -type f -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) + - name: broker docker logs if: always() run: | @@ -387,6 +394,13 @@ jobs: --expected tests/data/results_json/${{ matrix.reco_algo }}/$(basename $outfile) \ --assert \ || (cat $(ls *.diff.json) && false) + + - name: reco-icetray logs + if: always() + run: | + tree $SKYSCAN_DEBUG_DIR | ls -R $SKYSCAN_DEBUG_DIR + find $SKYSCAN_DEBUG_DIR -type f -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) + - name: broker docker logs if: always() run: | From 7e07ff1f85779a6584bbdff670bac06cdae26556 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 21 Sep 2023 17:45:04 -0500 Subject: [PATCH 59/93] dump reco-icetray logs - 2 (ignore `.i3` and `.pkl` files --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c01d464aa..ce75ff003 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -294,7 +294,7 @@ jobs: if: always() run: | tree $SKYSCAN_DEBUG_DIR | ls -R $SKYSCAN_DEBUG_DIR - find $SKYSCAN_DEBUG_DIR -type f -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) + find $SKYSCAN_DEBUG_DIR -type f -not -name "*.i3" -not -name "*.pkl" -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) - name: broker docker logs if: always() @@ -399,7 +399,7 @@ jobs: if: always() run: | tree $SKYSCAN_DEBUG_DIR | ls -R $SKYSCAN_DEBUG_DIR - find $SKYSCAN_DEBUG_DIR -type f -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) + find $SKYSCAN_DEBUG_DIR -type f -not -name "*.i3" -not -name "*.pkl" -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) - name: broker docker logs if: always() From 85c0e28064d8d2bd1b97ade0dfb5aa71ffa2db21 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Thu, 21 Sep 2023 17:46:23 -0500 Subject: [PATCH 60/93] use `tree` --- .github/workflows/tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index ce75ff003..be5fa8289 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -293,7 +293,8 @@ jobs: - name: reco-icetray logs if: always() run: | - tree $SKYSCAN_DEBUG_DIR | ls -R $SKYSCAN_DEBUG_DIR + sudo apt install tree + tree $SKYSCAN_DEBUG_DIR find $SKYSCAN_DEBUG_DIR -type f -not -name "*.i3" -not -name "*.pkl" -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) - name: broker docker logs @@ -398,7 +399,8 @@ jobs: - name: reco-icetray logs if: always() run: | - tree $SKYSCAN_DEBUG_DIR | ls -R $SKYSCAN_DEBUG_DIR + sudo apt install tree + tree $SKYSCAN_DEBUG_DIR find $SKYSCAN_DEBUG_DIR -type f -not -name "*.i3" -not -name "*.pkl" -exec "more" {} + | cat # recursively cats with filenames (delimited by :::::::) - name: broker docker logs From 3b776851b054db20e7e6967ac3f013455eb2f67d Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Thu, 21 Sep 2023 23:13:42 +0000 Subject: [PATCH 61/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 2 +- dependencies-from-Dockerfile_pulsar.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index 0d976e0b3..474deef35 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.3 +ewms-pilot==0.12.4 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index de5d1a8d0..7f18629c0 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.3 +ewms-pilot==0.12.4 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 From 75fed2f0d78c9f2a3795b120c40ed55a4b3176ae Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 10:25:07 -0500 Subject: [PATCH 62/93] turn off gha `concurrency` (temp) --- .github/workflows/tests.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index be5fa8289..29abe1900 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,10 +9,10 @@ on: - '**' -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - # don't cancel on main/master/default - cancel-in-progress: ${{ format('refs/heads/{0}', github.event.repository.default_branch) != github.ref }} +# concurrency: +# group: ${{ github.workflow }}-${{ github.ref }} +# # don't cancel on main/master/default +# cancel-in-progress: ${{ format('refs/heads/{0}', github.event.repository.default_branch) != github.ref }} env: From 8e7934d9d29f1caabbfc5b428bdf3e40b9149231 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 10:46:56 -0500 Subject: [PATCH 63/93] launch with one client on runners with multitasking --- .github/workflows/tests.yml | 23 +++++++++++++++++++---- resources/launch_scripts/local-scan.sh | 3 +-- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 29abe1900..1949808c1 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -187,7 +187,7 @@ jobs: ./resources/launch_scripts/wait_for_file.sh ./startup.json $CLIENT_STARTER_WAIT_FOR_STARTUP_JSON # Launch Clients - nclients=$(( $_CLIENTS_PER_CPU * $(nproc) )) + nclients=$(( $_NCLIENTS * $(nproc) )) echo "Launching $nclients clients" mkdir $SKYSCAN_DEBUG_DIR export EWMS_PILOT_TASK_TIMEOUT=1800 # 30 mins @@ -230,8 +230,11 @@ jobs: 1.0, 0.65, ] + ewms_pilot_concurrent_tasks: [ + 0, + 2, + ] env: - _CLIENTS_PER_CPU: 1 # there isn't any improvement when >1 SKYSCAN_BROKER_ADDRESS: user1@localhost/test SKYSCAN_BROKER_AUTH: password # using this would override password in address services: @@ -271,10 +274,16 @@ jobs: export _EVENTS_FILE=$(realpath $REALTIME_EVENTS_DIR/hese_event_01.json) export _NSIDES="${{ matrix.nsides }}" export _PREDICTIVE_SCANNING_THRESHOLD=${{ matrix.predictive_scanning_threshold }} + export _NCLIENTS=$(nproc) + + export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + free # dump memory stats cd ./resources/launch_scripts ./local-scan.sh + free # dump memory stats + - name: check no nsides skipped run: | ls $SKYSCAN_OUTPUT_DIR @@ -320,14 +329,13 @@ jobs: ] ewms_pilot_concurrent_tasks: [ 0, - 3, + 2, ] exclude: # splinempe should not run on HESE - reco_algo: splinempe eventfile: hese_event_01.json env: - _CLIENTS_PER_CPU: 1 # there isn't any improvement when >1 SKYSCAN_BROKER_ADDRESS: user1@localhost/test SKYSCAN_BROKER_AUTH: password # using this would override password in address services: @@ -375,6 +383,13 @@ jobs: export _NSIDES="1:0" export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + if [[ $EWMS_PILOT_CONCURRENT_TASKS == "0" ]]; then + # if not using concurrent tasks, then use multiple clients + export _NCLIENTS=$(nproc) + else + export _NCLIENTS=1 + fi + free # dump memory stats cd ./resources/launch_scripts diff --git a/resources/launch_scripts/local-scan.sh b/resources/launch_scripts/local-scan.sh index 6679b6656..3375c11f2 100755 --- a/resources/launch_scripts/local-scan.sh +++ b/resources/launch_scripts/local-scan.sh @@ -48,8 +48,7 @@ fi # Launch Clients -clients_per_cpu=${_CLIENTS_PER_CPU:-"1"} -nclients=$(( $clients_per_cpu * $(nproc) )) +nclients=${_NCLIENTS:-"1"} echo "Launching $nclients clients" export EWMS_PILOT_TASK_TIMEOUT=1800 # 30 mins for i in $( seq 1 $nclients ); do From 26a9f165b8728314a91f6b3e825725b02a4804bf Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 10:49:45 -0500 Subject: [PATCH 64/93] use `--ipc="host"` --- resources/launch_scripts/docker/launch_client.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index 0908e56b6..38ff89e4f 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -70,6 +70,7 @@ fi # Run docker run --network="host" $pull_policy --rm -i \ + --ipc="host" \ --shm-size=6gb \ $DOCKERMOUNT_ARGS \ --env PY_COLORS=1 \ From d5ca7b659d320bfb479acfac2bff5c1bd29d779a Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Tue, 26 Sep 2023 16:12:21 +0000 Subject: [PATCH 65/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile_no_cvmfs.log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies-from-Dockerfile_no_cvmfs.log b/dependencies-from-Dockerfile_no_cvmfs.log index e4ac46835..644f3ef98 100644 --- a/dependencies-from-Dockerfile_no_cvmfs.log +++ b/dependencies-from-Dockerfile_no_cvmfs.log @@ -126,7 +126,7 @@ typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 -urllib3==2.0.4 +urllib3==2.0.5 urwid==2.1.2 wcwidth==0.2.5 webencodings==0.5.1 From e251147848a735b9e068c282e5e9a2a1db6cce6f Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 11:45:49 -0500 Subject: [PATCH 66/93] Revert "use `--ipc="host"`" This reverts commit 26a9f165b8728314a91f6b3e825725b02a4804bf. --- resources/launch_scripts/docker/launch_client.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index 38ff89e4f..0908e56b6 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -70,7 +70,6 @@ fi # Run docker run --network="host" $pull_policy --rm -i \ - --ipc="host" \ --shm-size=6gb \ $DOCKERMOUNT_ARGS \ --env PY_COLORS=1 \ From 7e93b79207b4f768e110e2768b986a29d9a12f04 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 11:54:23 -0500 Subject: [PATCH 67/93] use `--shm-size=16gb` --- resources/launch_scripts/docker/launch_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index 0908e56b6..c6c7b9ae4 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -70,7 +70,7 @@ fi # Run docker run --network="host" $pull_policy --rm -i \ - --shm-size=6gb \ + --shm-size=16gb \ $DOCKERMOUNT_ARGS \ --env PY_COLORS=1 \ $(env | grep '^SKYSCAN_' | awk '$0="--env "$0') \ From 313ec032da32891c991adddab698abdebb33e923 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 15:20:23 -0500 Subject: [PATCH 68/93] fix f-string --- skymap_scanner/utils/data_handling.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/skymap_scanner/utils/data_handling.py b/skymap_scanner/utils/data_handling.py index f44f0e972..9e6fe487a 100644 --- a/skymap_scanner/utils/data_handling.py +++ b/skymap_scanner/utils/data_handling.py @@ -1,14 +1,15 @@ -from .. import config as cfg # type: ignore[import] -from pathlib import Path import subprocess +from pathlib import Path from typing import Dict, List, Union +from .. import config as cfg # type: ignore[import] from . import LOGGER class DataStager: - """ - Class to manage the staging of (spline) data from different sources (in-container, mountpoint, CVMFS, http). + """Class to manage the staging of (spline) data from different sources (in- + container, mountpoint, CVMFS, http). + Some similarity in the paths is assumed. """ @@ -20,7 +21,8 @@ def __init__(self, local_paths: List[Path], local_subdir: str, remote_path: str) self.staging_path.mkdir(exist_ok=True) def stage_files(self, file_list: List[str]): - """Checks local availability for filenames in a list, and retrieves the missing ones from the HTTP source. + """Checks local availability for filenames in a list, and retrieves the + missing ones from the HTTP source. Args: file_list (List[str]): list of file filenames to look up / retrieve. @@ -72,7 +74,8 @@ def stage_file(self, basename: str): ) def get_filepath(self, filename: str) -> str: - """Look up basename under the local paths and the staging path and returns the first valid filename. + """Look up basename under the local paths and the staging path and + returns the first valid filename. Args: basename (str): file basename to look up. @@ -86,7 +89,7 @@ def get_filepath(self, filename: str) -> str: except FileNotFoundError: filepath = self.staging_path / filename if filepath.is_file(): - LOGGER.info("File {filename} available at {filepath}.") + LOGGER.info(f"File {filename} available at {filepath}.") return str(filepath) else: raise FileNotFoundError( @@ -94,7 +97,8 @@ def get_filepath(self, filename: str) -> str: ) def get_local_filepath(self, filename: str) -> str: - """Look up filename on local paths and return the first matching filename. + """Look up filename on local paths and return the first matching + filename. Args: filename (str): the filename of the file to look up. From 6b9577d6241610e3a0230741c8a1347ef3586ec0 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Tue, 26 Sep 2023 15:25:41 -0500 Subject: [PATCH 69/93] use `--shm-size=32gb` --- resources/launch_scripts/docker/launch_client.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index c6c7b9ae4..208a9db24 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -70,7 +70,7 @@ fi # Run docker run --network="host" $pull_policy --rm -i \ - --shm-size=16gb \ + --shm-size=32gb \ $DOCKERMOUNT_ARGS \ --env PY_COLORS=1 \ $(env | grep '^SKYSCAN_' | awk '$0="--env "$0') \ From ab97c022287c9c96890e1bcb81204b159ec483fe Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 27 Sep 2023 13:50:38 -0500 Subject: [PATCH 70/93] temp - `ls /dev/shm` outside and inside container --- resources/launch_scripts/docker/launch_client.sh | 1 + skymap_scanner/client/client.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index 208a9db24..ad25d4d08 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -67,6 +67,7 @@ else pull_policy="--pull=always" fi +ls /dev/shm # Run docker run --network="host" $pull_policy --rm -i \ diff --git a/skymap_scanner/client/client.py b/skymap_scanner/client/client.py index 73e5c19f3..7ae3da31e 100644 --- a/skymap_scanner/client/client.py +++ b/skymap_scanner/client/client.py @@ -4,6 +4,7 @@ import asyncio import json import logging +import os from pathlib import Path import ewms_pilot @@ -16,6 +17,8 @@ def main() -> None: """Start up Client service.""" + print(os.listdir("/dev/shm")) + parser = argparse.ArgumentParser( description=( "Start up client daemon to perform reco scans on pixels " From 807223bffa837f443831f2502fd67171996de05e Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Wed, 27 Sep 2023 19:44:10 +0000 Subject: [PATCH 71/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 2 +- dependencies-from-Dockerfile_pulsar.log | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index 474deef35..aece7d2c7 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.4 +ewms-pilot==0.14.0 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index 7f18629c0..bd3a86e5f 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.4 +ewms-pilot==0.14.0 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 From f55de80bf9e12fb11fcf18eb58142f13eede80ac Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 27 Sep 2023 14:57:13 -0500 Subject: [PATCH 72/93] temp - `ls /dev/shm` outside and inside container - 2 --- .github/workflows/tests.yml | 2 + .../launch_scripts/docker/launch_client.sh | 2 - skymap_scanner/client/client.py | 38 ++++++++++--------- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1949808c1..401c2660b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -390,12 +390,14 @@ jobs: export _NCLIENTS=1 fi + ls /dev/shm free # dump memory stats cd ./resources/launch_scripts ./local-scan.sh free # dump memory stats + ls /dev/shm - name: test output against known result (.json) run: | diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index ad25d4d08..5ea05fd1c 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -67,8 +67,6 @@ else pull_policy="--pull=always" fi -ls /dev/shm - # Run docker run --network="host" $pull_policy --rm -i \ --shm-size=32gb \ diff --git a/skymap_scanner/client/client.py b/skymap_scanner/client/client.py index 7ae3da31e..b24c82e91 100644 --- a/skymap_scanner/client/client.py +++ b/skymap_scanner/client/client.py @@ -17,7 +17,7 @@ def main() -> None: """Start up Client service.""" - print(os.listdir("/dev/shm")) + LOGGER.critical(os.listdir("/dev/shm")) parser = argparse.ArgumentParser( description=( @@ -84,23 +84,27 @@ def main() -> None: LOGGER.info( f"Starting up a Skymap Scanner client for event: {startup_json_dict['mq_basename']=}" ) - asyncio.run( - ewms_pilot.consume_and_reply( - cmd=cmd, - broker_client=cfg.ENV.SKYSCAN_BROKER_CLIENT, - broker_address=cfg.ENV.SKYSCAN_BROKER_ADDRESS, - auth_token=cfg.ENV.SKYSCAN_BROKER_AUTH, - queue_incoming=f"to-clients-{startup_json_dict['mq_basename']}", - queue_outgoing=f"from-clients-{startup_json_dict['mq_basename']}", - ftype_to_subproc=".pkl", - ftype_from_subproc=".pkl", - timeout_incoming=cfg.ENV.SKYSCAN_MQ_TIMEOUT_TO_CLIENTS, - timeout_outgoing=cfg.ENV.SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS, - timeout_wait_for_first_message=cfg.ENV.SKYSCAN_MQ_CLIENT_TIMEOUT_WAIT_FOR_FIRST_MESSAGE, - debug_dir=args.debug_directory, - task_timeout=cfg.ENV.EWMS_PILOT_TASK_TIMEOUT, + try: + asyncio.run( + ewms_pilot.consume_and_reply( + cmd=cmd, + broker_client=cfg.ENV.SKYSCAN_BROKER_CLIENT, + broker_address=cfg.ENV.SKYSCAN_BROKER_ADDRESS, + auth_token=cfg.ENV.SKYSCAN_BROKER_AUTH, + queue_incoming=f"to-clients-{startup_json_dict['mq_basename']}", + queue_outgoing=f"from-clients-{startup_json_dict['mq_basename']}", + ftype_to_subproc=".pkl", + ftype_from_subproc=".pkl", + timeout_incoming=cfg.ENV.SKYSCAN_MQ_TIMEOUT_TO_CLIENTS, + timeout_outgoing=cfg.ENV.SKYSCAN_MQ_TIMEOUT_FROM_CLIENTS, + timeout_wait_for_first_message=cfg.ENV.SKYSCAN_MQ_CLIENT_TIMEOUT_WAIT_FOR_FIRST_MESSAGE, + debug_dir=args.debug_directory, + task_timeout=cfg.ENV.EWMS_PILOT_TASK_TIMEOUT, + ) ) - ) + except: + LOGGER.critical(os.listdir("/dev/shm")) + raise LOGGER.info("Done.") From 9e738f86cbbf86f608760205e405a4f608ae48fe Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Wed, 27 Sep 2023 17:28:25 -0500 Subject: [PATCH 73/93] Revert "Revert "use `--ipc="host"`"" This reverts commit e251147848a735b9e068c282e5e9a2a1db6cce6f. --- resources/launch_scripts/docker/launch_client.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/launch_scripts/docker/launch_client.sh b/resources/launch_scripts/docker/launch_client.sh index 5ea05fd1c..6160d557d 100755 --- a/resources/launch_scripts/docker/launch_client.sh +++ b/resources/launch_scripts/docker/launch_client.sh @@ -67,8 +67,10 @@ else pull_policy="--pull=always" fi + # Run docker run --network="host" $pull_policy --rm -i \ + --ipc="host" \ --shm-size=32gb \ $DOCKERMOUNT_ARGS \ --env PY_COLORS=1 \ From d11c8360ed8f3c09bcca9005a0dadc9152653452 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Fri, 29 Sep 2023 18:35:29 +0000 Subject: [PATCH 74/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 4 ++-- dependencies-from-Dockerfile_no_cvmfs.log | 4 ++-- dependencies-from-Dockerfile_pulsar.log | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index aece7d2c7..d9490bdec 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -26,13 +26,13 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.14.0 +ewms-pilot==0.15.0 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 healpy==1.15.0 htchirp==2.0 -htcondor==10.8.0 +htcondor==23.0.0 html5lib==1.1 humanfriendly==10.0 hypothesis==6.36.0 diff --git a/dependencies-from-Dockerfile_no_cvmfs.log b/dependencies-from-Dockerfile_no_cvmfs.log index 644f3ef98..aece7d2c7 100644 --- a/dependencies-from-Dockerfile_no_cvmfs.log +++ b/dependencies-from-Dockerfile_no_cvmfs.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.12.2 +ewms-pilot==0.14.0 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 @@ -64,7 +64,7 @@ numexpr==2.8.1 numpy==1.21.5 odfpy==1.4.2 olefile==0.46 -oms-mqclient==2.4.4 +oms-mqclient==2.4.6 openpyxl==3.0.9 packaging==21.3 pandas==1.3.5 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index bd3a86e5f..e65f98f86 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.14.0 +ewms-pilot==0.15.0 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 From 5f9b31137b6d4f3a759d8ee0c4bb7c3076a30d09 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 09:48:21 -0500 Subject: [PATCH 75/93] misc --- tests/env-vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/env-vars.sh b/tests/env-vars.sh index 6150b0c99..976415e2a 100755 --- a/tests/env-vars.sh +++ b/tests/env-vars.sh @@ -20,6 +20,6 @@ export SKYSCAN_MINI_TEST=${SKYSCAN_MINI_TEST:-'yes'} export SKYSCAN_LOG=${SKYSCAN_LOG:-"DEBUG"} export SKYSCAN_LOG_THIRD_PARTY=${SKYSCAN_LOG_THIRD_PARTY:-"INFO"} -export CLIENT_STARTER_WAIT_FOR_STARTUP_JSON=${CLIENT_STARTER_WAIT_FOR_STARTUP_JSON:-12} +export CLIENT_STARTER_WAIT_FOR_STARTUP_JSON=${CLIENT_STARTER_WAIT_FOR_STARTUP_JSON:-120} set +ex # file is sourced so turn off \ No newline at end of file From ea6925801207964f4249fe31db018aa24361796d Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 10:13:16 -0500 Subject: [PATCH 76/93] add `client/prepare.py` and use as `init_cmd` --- skymap_scanner/client/client.py | 6 ++++ skymap_scanner/client/prepare.py | 48 ++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 skymap_scanner/client/prepare.py diff --git a/skymap_scanner/client/client.py b/skymap_scanner/client/client.py index b24c82e91..a39f2c4fa 100644 --- a/skymap_scanner/client/client.py +++ b/skymap_scanner/client/client.py @@ -80,6 +80,11 @@ def main() -> None: f" --reco-algo {startup_json_dict['reco_algo']}" ) + init_cmd = ( + "python -m skymap_scanner.client.prepare " + f" --reco-algo {startup_json_dict['reco_algo']}" + ) + # go! LOGGER.info( f"Starting up a Skymap Scanner client for event: {startup_json_dict['mq_basename']=}" @@ -88,6 +93,7 @@ def main() -> None: asyncio.run( ewms_pilot.consume_and_reply( cmd=cmd, + init_cmd=init_cmd, broker_client=cfg.ENV.SKYSCAN_BROKER_CLIENT, broker_address=cfg.ENV.SKYSCAN_BROKER_ADDRESS, auth_token=cfg.ENV.SKYSCAN_BROKER_AUTH, diff --git a/skymap_scanner/client/prepare.py b/skymap_scanner/client/prepare.py new file mode 100644 index 000000000..89dd5b498 --- /dev/null +++ b/skymap_scanner/client/prepare.py @@ -0,0 +1,48 @@ +"""Setup common resources for future IceTray instances of a specified +reconstruction.""" + + +import argparse +import logging + +from wipac_dev_tools import logging_tools + +from .. import config as cfg +from .. import recos + +LOGGER = logging.getLogger("skyscan.client.prepare") + + +def main() -> None: + """Reco a single pixel.""" + parser = argparse.ArgumentParser( + description="Setup common resources for future IceTray instances of a specified reconstruction.", + formatter_class=argparse.ArgumentDefaultsHelpFormatter, + ) + + # "physics" args + parser.add_argument( + "--reco-algo", + required=True, + choices=recos.get_all_reco_algos(), + help="The reconstruction algorithm prepare for", + ) + + args = parser.parse_args() + logging_tools.set_level( + cfg.ENV.SKYSCAN_LOG, # type: ignore[arg-type] + first_party_loggers="skyscan", + third_party_level=cfg.ENV.SKYSCAN_LOG_THIRD_PARTY, # type: ignore[arg-type] + use_coloredlogs=True, + ) + logging_tools.log_argparse_args(args, logger=LOGGER, level="WARNING") + + # go! + RecoAlgo = recos.get_reco_interface_object(args.reco_algo)() + reco = RecoAlgo() + reco.setup_reco() + LOGGER.info("Done.") + + +if __name__ == "__main__": + main() From 32067c1dd9c7b9f3e8bce7551bea2eed989070e8 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 10:19:07 -0500 Subject: [PATCH 77/93] clean up `if __name__ == "__main__"` blocks and `Done` logging --- skymap_scanner/client/__init__.py | 5 +++++ skymap_scanner/client/__main__.py | 3 ++- skymap_scanner/client/client.py | 9 +-------- skymap_scanner/client/prepare.py | 2 +- skymap_scanner/client/reco_icetray.py | 2 +- skymap_scanner/server/__main__.py | 3 ++- skymap_scanner/server/start_scan.py | 8 +------- 7 files changed, 13 insertions(+), 19 deletions(-) diff --git a/skymap_scanner/client/__init__.py b/skymap_scanner/client/__init__.py index e69de29bb..a08a6e9ee 100644 --- a/skymap_scanner/client/__init__.py +++ b/skymap_scanner/client/__init__.py @@ -0,0 +1,5 @@ +"""Init.""" + +import logging + +LOGGER = logging.getLogger("skyscan.client") diff --git a/skymap_scanner/client/__main__.py b/skymap_scanner/client/__main__.py index 5ab089393..2346ac67a 100644 --- a/skymap_scanner/client/__main__.py +++ b/skymap_scanner/client/__main__.py @@ -1,6 +1,7 @@ """Entry-point to start up client service.""" -from . import client +from . import LOGGER, client if __name__ == "__main__": client.main() + LOGGER.info("Done.") diff --git a/skymap_scanner/client/client.py b/skymap_scanner/client/client.py index a39f2c4fa..5e0524812 100644 --- a/skymap_scanner/client/client.py +++ b/skymap_scanner/client/client.py @@ -3,7 +3,6 @@ import argparse import asyncio import json -import logging import os from pathlib import Path @@ -11,8 +10,7 @@ from wipac_dev_tools import argparse_tools, logging_tools from .. import config as cfg - -LOGGER = logging.getLogger("skyscan.client") +from . import LOGGER def main() -> None: @@ -111,8 +109,3 @@ def main() -> None: except: LOGGER.critical(os.listdir("/dev/shm")) raise - LOGGER.info("Done.") - - -if __name__ == "__main__": - main() diff --git a/skymap_scanner/client/prepare.py b/skymap_scanner/client/prepare.py index 89dd5b498..a0650b719 100644 --- a/skymap_scanner/client/prepare.py +++ b/skymap_scanner/client/prepare.py @@ -41,8 +41,8 @@ def main() -> None: RecoAlgo = recos.get_reco_interface_object(args.reco_algo)() reco = RecoAlgo() reco.setup_reco() - LOGGER.info("Done.") if __name__ == "__main__": main() + LOGGER.info("Done.") diff --git a/skymap_scanner/client/reco_icetray.py b/skymap_scanner/client/reco_icetray.py index edd5dc02b..cfdb88692 100644 --- a/skymap_scanner/client/reco_icetray.py +++ b/skymap_scanner/client/reco_icetray.py @@ -299,8 +299,8 @@ def main() -> None: str(args.baseline_GCD_file), args.out_pkl, ) - LOGGER.info("Done reco'ing pixel.") if __name__ == "__main__": main() + LOGGER.info("Done.") diff --git a/skymap_scanner/server/__main__.py b/skymap_scanner/server/__main__.py index 714033891..297223460 100644 --- a/skymap_scanner/server/__main__.py +++ b/skymap_scanner/server/__main__.py @@ -1,6 +1,7 @@ """Entry-point to start up server.""" -from . import start_scan +from . import LOGGER, start_scan if __name__ == "__main__": start_scan.main() + LOGGER.info("Done.") diff --git a/skymap_scanner/server/start_scan.py b/skymap_scanner/server/start_scan.py index 5cbee3b83..ca0d8a807 100644 --- a/skymap_scanner/server/start_scan.py +++ b/skymap_scanner/server/start_scan.py @@ -15,14 +15,13 @@ import healpy # type: ignore[import] import mqclient as mq import numpy -from icecube.icetray import I3Units # type: ignore[import] from icecube import ( # type: ignore[import] astro, dataclasses, full_event_followup, icetray, ) -from rest_tools.client import RestClient +from icecube.icetray import I3Units # type: ignore[import] from skyreader import EventMetadata from wipac_dev_tools import argparse_tools, logging_tools @@ -744,8 +743,3 @@ def _nside_and_pixelextension(val: str) -> Tuple[int, int]: predictive_scanning_threshold=args.predictive_scanning_threshold, ) ) - LOGGER.info("Done.") - - -if __name__ == "__main__": - main() From f8b0da2301041f28a358dabf219dc68d510a8776 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 10:23:04 -0500 Subject: [PATCH 78/93] fix call --- skymap_scanner/client/prepare.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skymap_scanner/client/prepare.py b/skymap_scanner/client/prepare.py index a0650b719..be470f96f 100644 --- a/skymap_scanner/client/prepare.py +++ b/skymap_scanner/client/prepare.py @@ -38,7 +38,7 @@ def main() -> None: logging_tools.log_argparse_args(args, logger=LOGGER, level="WARNING") # go! - RecoAlgo = recos.get_reco_interface_object(args.reco_algo)() + RecoAlgo = recos.get_reco_interface_object(args.reco_algo) reco = RecoAlgo() reco.setup_reco() From 36ab7b1ae64e24a84d3934ce6af70231ff43352a Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 2 Oct 2023 15:24:12 +0000 Subject: [PATCH 79/93] update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index 18fc5ca9f..cb43ed876 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,7 @@ install_requires = oms-mqclient wipac-dev-tools[coloredlogs] wipac-rest-tools -python_requires = >=3.9, <3.12 +python_requires = >=3.9, <3.13 packages = find: [options.extras_require] From 6a499a14fee03596f03e9007598a9f9579d77939 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 12:06:01 -0500 Subject: [PATCH 80/93] use `WIPACrepo/wipac-dev-py-setup-action@v2.6` --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6ac4123ff..1f4fdc235 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -78,7 +78,7 @@ jobs: uses: actions/checkout@v3 with: token: ${{ secrets.PERSONAL_ACCESS_TOKEN }} - - uses: WIPACrepo/wipac-dev-py-setup-action@v2.5 + - uses: WIPACrepo/wipac-dev-py-setup-action@v2.6 if: github.actor != ${{ env.BOT_NAME }} # no auto-updates for bots # should match all 'git_committer_name' uses with: git_committer_name: ${{ env.BOT_NAME }} From 35e3f40d96d8509994a09c88cc0ff42d08d04fd9 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 2 Oct 2023 17:27:06 +0000 Subject: [PATCH 81/93] update setup.cfg --- setup.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.cfg b/setup.cfg index cb43ed876..18fc5ca9f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -26,7 +26,7 @@ install_requires = oms-mqclient wipac-dev-tools[coloredlogs] wipac-rest-tools -python_requires = >=3.9, <3.13 +python_requires = >=3.9, <3.12 packages = find: [options.extras_require] From 4588914206a47079a60ee242f69e7d66a0fbd773 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 2 Oct 2023 17:48:58 +0000 Subject: [PATCH 82/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 2 +- dependencies-from-Dockerfile_pulsar.log | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index d9490bdec..8b4d7c245 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -126,7 +126,7 @@ typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 -urllib3==2.0.5 +urllib3==2.0.6 urwid==2.1.2 wcwidth==0.2.5 webencodings==0.5.1 diff --git a/dependencies-from-Dockerfile_pulsar.log b/dependencies-from-Dockerfile_pulsar.log index e65f98f86..637b1a20f 100644 --- a/dependencies-from-Dockerfile_pulsar.log +++ b/dependencies-from-Dockerfile_pulsar.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.15.0 +ewms-pilot==0.15.1 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 @@ -126,7 +126,7 @@ typing_extensions==4.8.0 ufoLib2==0.13.1 unicodedata2==14.0.0 UNKNOWN @ file:///root/nuflux-2.0.4 -urllib3==2.0.5 +urllib3==2.0.6 urwid==2.1.2 wcwidth==0.2.5 webencodings==0.5.1 From 10a29e0c95c5590bd1e458e224916c28fbc80fc3 Mon Sep 17 00:00:00 2001 From: wipacdevbot Date: Mon, 2 Oct 2023 18:08:23 +0000 Subject: [PATCH 83/93] update dependencies*.log files(s) --- dependencies-from-Dockerfile.log | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies-from-Dockerfile.log b/dependencies-from-Dockerfile.log index 8b4d7c245..c4e8a88d7 100644 --- a/dependencies-from-Dockerfile.log +++ b/dependencies-from-Dockerfile.log @@ -26,7 +26,7 @@ decorator==4.4.2 defusedxml==0.7.1 docutils==0.20.1 et-xmlfile==1.0.1 -ewms-pilot==0.15.0 +ewms-pilot==0.15.1 fonttools==4.29.1 fs==2.4.12 gast==0.5.2 From fe8b558a1bc97bb83e4c71f9cc9a239e81c91fd4 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 16:15:06 -0500 Subject: [PATCH 84/93] rename to `client/pilot subprocesses stderr & stdout` --- .github/workflows/tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1f4fdc235..5e4b2ef7d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -23,7 +23,7 @@ env: SKYSCAN_CACHE_DIR: /home/runner/work/skymap_scanner/skymap_scanner/cache SKYSCAN_OUTPUT_DIR: /home/runner/work/skymap_scanner/skymap_scanner/output SKYSCAN_DEBUG_DIR: /home/runner/work/skymap_scanner/skymap_scanner/debug - EWMS_PILOT_DUMP_SUBPROC_OUTPUT: False # get logs in "reco-icetray logs" step instead + EWMS_PILOT_DUMP_SUBPROC_OUTPUT: False # get logs in "client/pilot subprocesses stderr & stdout" step instead # see source tests/env-vars.sh @@ -300,7 +300,7 @@ jobs: assert len(pydict) == nsides.count(":") ' - - name: reco-icetray logs + - name: client/pilot subprocesses stderr & stdout if: always() run: | sudo apt install tree @@ -414,7 +414,7 @@ jobs: --assert \ || (cat $(ls *.diff.json) && false) - - name: reco-icetray logs + - name: client/pilot subprocesses stderr & stdout if: always() run: | sudo apt install tree From 5ff47a2f93a1a5d5c6a04feeb59613072c6f415b Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 16:19:28 -0500 Subject: [PATCH 85/93] add sleep for non parallel case --- resources/launch_scripts/local-scan.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/resources/launch_scripts/local-scan.sh b/resources/launch_scripts/local-scan.sh index 3375c11f2..bc43d4c65 100755 --- a/resources/launch_scripts/local-scan.sh +++ b/resources/launch_scripts/local-scan.sh @@ -52,6 +52,9 @@ nclients=${_NCLIENTS:-"1"} echo "Launching $nclients clients" export EWMS_PILOT_TASK_TIMEOUT=1800 # 30 mins for i in $( seq 1 $nclients ); do + if [[ $i != "2" ]]; then + sleep 30 # sleep past race condition + fi ./docker/launch_client.sh \ --client-startup-json ./startup.json \ --debug-directory $SKYSCAN_DEBUG_DIR \ From 509c473563f6ca43f5993780aaae83fa52eb78dc Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 16:19:51 -0500 Subject: [PATCH 86/93] add sleep for non parallel case - 2 --- resources/launch_scripts/local-scan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/launch_scripts/local-scan.sh b/resources/launch_scripts/local-scan.sh index bc43d4c65..b7fa3a76c 100755 --- a/resources/launch_scripts/local-scan.sh +++ b/resources/launch_scripts/local-scan.sh @@ -52,7 +52,7 @@ nclients=${_NCLIENTS:-"1"} echo "Launching $nclients clients" export EWMS_PILOT_TASK_TIMEOUT=1800 # 30 mins for i in $( seq 1 $nclients ); do - if [[ $i != "2" ]]; then + if [[ $i == "2" ]]; then sleep 30 # sleep past race condition fi ./docker/launch_client.sh \ From b587266cfc89242d2246b28e346035f766985f94 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 16:27:58 -0500 Subject: [PATCH 87/93] use `tasks_concurrency` (`yes/no`) for setting task concurrency --- .github/workflows/tests.yml | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 5e4b2ef7d..883720da7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -231,9 +231,9 @@ jobs: 1.0, 0.65, ] - ewms_pilot_concurrent_tasks: [ - 0, - 2, + tasks_concurrency: [ + 'yes', + 'no', ] env: SKYSCAN_BROKER_ADDRESS: user1@localhost/test @@ -277,7 +277,15 @@ jobs: export _PREDICTIVE_SCANNING_THRESHOLD=${{ matrix.predictive_scanning_threshold }} export _NCLIENTS=$(nproc) - export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} + if [[ ${{ matrix.tasks_concurrency }} == "no" ]]; then + # if not using concurrent tasks, then use multiple clients + export _NCLIENTS=$(nproc) + export EWMS_PILOT_CONCURRENT_TASKS=0 + else + export _NCLIENTS=1 + export EWMS_PILOT_CONCURRENT_TASKS=$(nproc) + fi + free # dump memory stats cd ./resources/launch_scripts @@ -328,9 +336,9 @@ jobs: run00136766-evt000007637140-GOLD.pkl, run00136662-evt000035405932-BRONZE.pkl ] - ewms_pilot_concurrent_tasks: [ - 0, - 2, + tasks_concurrency: [ + 'yes', + 'no', ] exclude: # splinempe should not run on HESE @@ -383,12 +391,13 @@ jobs: export _EVENTS_FILE=$(realpath $REALTIME_EVENTS_DIR/${{ matrix.eventfile }}) export _NSIDES="1:0" - export EWMS_PILOT_CONCURRENT_TASKS=${{ matrix.ewms_pilot_concurrent_tasks }} - if [[ $EWMS_PILOT_CONCURRENT_TASKS == "0" ]]; then + if [[ ${{ matrix.tasks_concurrency }} == "no" ]]; then # if not using concurrent tasks, then use multiple clients export _NCLIENTS=$(nproc) + export EWMS_PILOT_CONCURRENT_TASKS=0 else export _NCLIENTS=1 + export EWMS_PILOT_CONCURRENT_TASKS=$(nproc) fi ls /dev/shm From c3f2a05376f116a9c8f5b96d3508b92687b23c55 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 16:32:30 -0500 Subject: [PATCH 88/93] add sleep for non parallel case - 3 --- resources/launch_scripts/local-scan.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/launch_scripts/local-scan.sh b/resources/launch_scripts/local-scan.sh index b7fa3a76c..853725414 100755 --- a/resources/launch_scripts/local-scan.sh +++ b/resources/launch_scripts/local-scan.sh @@ -53,7 +53,7 @@ echo "Launching $nclients clients" export EWMS_PILOT_TASK_TIMEOUT=1800 # 30 mins for i in $( seq 1 $nclients ); do if [[ $i == "2" ]]; then - sleep 30 # sleep past race condition + sleep 60 # sleep past race condition fi ./docker/launch_client.sh \ --client-startup-json ./startup.json \ From 7c7dc14447a28c58566e59970dde12eceefcb71f Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 16:53:42 -0500 Subject: [PATCH 89/93] use `multiclient/multitask` --- .github/workflows/tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 883720da7..9d8cded08 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -231,9 +231,9 @@ jobs: 1.0, 0.65, ] - tasks_concurrency: [ - 'yes', - 'no', + concurrency: [ + 'multitask', + "multiclient", ] env: SKYSCAN_BROKER_ADDRESS: user1@localhost/test @@ -277,7 +277,7 @@ jobs: export _PREDICTIVE_SCANNING_THRESHOLD=${{ matrix.predictive_scanning_threshold }} export _NCLIENTS=$(nproc) - if [[ ${{ matrix.tasks_concurrency }} == "no" ]]; then + if [[ ${{ matrix.concurrency }} == "multiclient" ]]; then # if not using concurrent tasks, then use multiple clients export _NCLIENTS=$(nproc) export EWMS_PILOT_CONCURRENT_TASKS=0 @@ -336,9 +336,9 @@ jobs: run00136766-evt000007637140-GOLD.pkl, run00136662-evt000035405932-BRONZE.pkl ] - tasks_concurrency: [ - 'yes', - 'no', + concurrency: [ + 'multitask', + "multiclient", ] exclude: # splinempe should not run on HESE @@ -391,7 +391,7 @@ jobs: export _EVENTS_FILE=$(realpath $REALTIME_EVENTS_DIR/${{ matrix.eventfile }}) export _NSIDES="1:0" - if [[ ${{ matrix.tasks_concurrency }} == "no" ]]; then + if [[ ${{ matrix.concurrency }} == "multiclient" ]]; then # if not using concurrent tasks, then use multiple clients export _NCLIENTS=$(nproc) export EWMS_PILOT_CONCURRENT_TASKS=0 From 51ebb6b320df5a1f1167b6141b5bcc3bea17998f Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 17:21:53 -0500 Subject: [PATCH 90/93] adjust logging & remove `LOGGER.*->` --- skymap_scanner/utils/data_handling.py | 27 ++++++++++++------------- skymap_scanner/utils/load_scan_state.py | 6 +++--- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/skymap_scanner/utils/data_handling.py b/skymap_scanner/utils/data_handling.py index 9e6fe487a..c3b1dda69 100644 --- a/skymap_scanner/utils/data_handling.py +++ b/skymap_scanner/utils/data_handling.py @@ -27,22 +27,22 @@ def stage_files(self, file_list: List[str]): Args: file_list (List[str]): list of file filenames to look up / retrieve. """ - LOGGER.debug(f"Staging files in filelist: {file_list}") + LOGGER.info(f"Staging files in filelist: {file_list}") for basename in file_list: try: filepath: str = self.get_local_filepath(basename) except FileNotFoundError: - LOGGER.debug( - f"File {basename} is not available on default local paths." - ) + LOGGER.info(f"File {basename} is not available on default local paths.") if (self.staging_path / basename).is_file(): - LOGGER.debug("File is available on staging path.") + LOGGER.info("File is available on staging path.") else: - LOGGER.debug("Staging from HTTP source.") + LOGGER.info("Staging from HTTP source.") self.stage_file(basename) else: - LOGGER.debug(f"File {basename} is available at {filepath}.") + LOGGER.info(f"File {basename} is available at {filepath}.") + + LOGGER.info(f"Finished staging files in filelist: {file_list}") def stage_file(self, basename: str): """Retrieves a file from the HTTP source. @@ -112,10 +112,9 @@ def get_local_filepath(self, filename: str) -> str: filepath = subdir / filename LOGGER.debug(f"Trying to read {filepath}...") if filepath.is_file(): - LOGGER.debug(f"-> success.") - filename = str(filepath) - return filename - else: - LOGGER.debug(f"-> fail.") - # File was not found in local paths. - raise FileNotFoundError(f"File {filename} is not available on any local path.") + LOGGER.debug(f"File found {filename}.") + return str(filepath) + + raise FileNotFoundError( + f"File {filename} is not available on any local path: {self.local_paths}." + ) diff --git a/skymap_scanner/utils/load_scan_state.py b/skymap_scanner/utils/load_scan_state.py index f873ea7de..f8a13adff 100644 --- a/skymap_scanner/utils/load_scan_state.py +++ b/skymap_scanner/utils/load_scan_state.py @@ -47,10 +47,10 @@ def get_baseline_gcd_frames(baseline_GCD_file, GCDQp_packet) -> List[icetray.I3F try: baseline_GCD_frames = load_framepacket_from_file(baseline_GCD_file) except: - LOGGER.debug(" -> failed") + LOGGER.debug(f"Failed to read GCD from {baseline_GCD_file}") raise RuntimeError("Unable to read baseline GCD. In the current design, this is unexpected. Possibly a bug or data corruption!") if baseline_GCD_frames is not None: - LOGGER.debug(" -> success") + LOGGER.debug("Retrieved GCD from file") # NOTE: Legacy code used to scan a list of GCD_BASE_DIRS. # It is now assumed that assume that the passed `baseline_GCD_file` is a valid path to a baseline GCD file. @@ -155,7 +155,7 @@ def load_GCDQp_state(event_metadata: EventMetadata, cache_dir="./cache/") -> dic LOGGER.debug("load_GCDQp_state => reading source baseline GCD from {0}".format(read_path)) source_baseline_GCD_framepacket = load_framepacket_from_file(read_path) except: - LOGGER.debug(" -> failed") + LOGGER.debug(f"Failed to load source baseline GCD from {read_path}") source_baseline_GCD_framepacket = None if source_baseline_GCD_framepacket is None: raise RuntimeError(f"load_GCDQp_state => Could not read the source GCD file \"{source_baseline_GCD_metadata}\"") From 6b25f1dacfd0ba9138b5e9dcbaa34dda1c3fc6db Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 17:36:40 -0500 Subject: [PATCH 91/93] ls /dev/shm after init --- skymap_scanner/client/client.py | 4 ++-- skymap_scanner/client/prepare.py | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/skymap_scanner/client/client.py b/skymap_scanner/client/client.py index 5e0524812..897bb7375 100644 --- a/skymap_scanner/client/client.py +++ b/skymap_scanner/client/client.py @@ -15,7 +15,7 @@ def main() -> None: """Start up Client service.""" - LOGGER.critical(os.listdir("/dev/shm")) + LOGGER.critical(f'/dev/shm: {os.listdir("/dev/shm")}') parser = argparse.ArgumentParser( description=( @@ -107,5 +107,5 @@ def main() -> None: ) ) except: - LOGGER.critical(os.listdir("/dev/shm")) + LOGGER.critical(f'/dev/shm: {os.listdir("/dev/shm")}') raise diff --git a/skymap_scanner/client/prepare.py b/skymap_scanner/client/prepare.py index be470f96f..cd3c2bf14 100644 --- a/skymap_scanner/client/prepare.py +++ b/skymap_scanner/client/prepare.py @@ -4,6 +4,7 @@ import argparse import logging +import os from wipac_dev_tools import logging_tools @@ -42,6 +43,8 @@ def main() -> None: reco = RecoAlgo() reco.setup_reco() + LOGGER.critical(f'/dev/shm: {os.listdir("/dev/shm")}') + if __name__ == "__main__": main() From 523805527fe2e72b652d21460ab059abea5c9118 Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 17:59:16 -0500 Subject: [PATCH 92/93] add logging around I3PhotoSplineService startup --- skymap_scanner/client/prepare.py | 2 +- skymap_scanner/client/reco_icetray.py | 2 +- skymap_scanner/recos/__init__.py | 9 ++++++--- skymap_scanner/recos/dummy.py | 4 ++-- skymap_scanner/recos/millipede_original.py | 4 +++- skymap_scanner/recos/millipede_wilks.py | 8 +++++--- skymap_scanner/recos/splinempe.py | 6 ++++-- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/skymap_scanner/client/prepare.py b/skymap_scanner/client/prepare.py index cd3c2bf14..9c419dc0e 100644 --- a/skymap_scanner/client/prepare.py +++ b/skymap_scanner/client/prepare.py @@ -41,7 +41,7 @@ def main() -> None: # go! RecoAlgo = recos.get_reco_interface_object(args.reco_algo) reco = RecoAlgo() - reco.setup_reco() + reco.setup_reco(LOGGER) LOGGER.critical(f'/dev/shm: {os.listdir("/dev/shm")}') diff --git a/skymap_scanner/client/reco_icetray.py b/skymap_scanner/client/reco_icetray.py index cfdb88692..94a0c351f 100644 --- a/skymap_scanner/client/reco_icetray.py +++ b/skymap_scanner/client/reco_icetray.py @@ -146,7 +146,7 @@ def notifyStart(frame): # create instance of reco_algo object RecoAlgo = recos.get_reco_interface_object(reco_algo) reco = RecoAlgo() - reco.setup_reco() + reco.setup_reco(LOGGER) # perform fit tray.AddSegment( diff --git a/skymap_scanner/recos/__init__.py b/skymap_scanner/recos/__init__.py index 447fc3bdc..bb145fd69 100644 --- a/skymap_scanner/recos/__init__.py +++ b/skymap_scanner/recos/__init__.py @@ -67,10 +67,13 @@ def prepare_frames(self, tray, name, **kwargs) -> None: pass @abstractmethod - def setup_reco(self): - """Performs the necessary operations to prepare the execution of the reconstruction traysegment. + def setup_reco(self, logger): + """Performs the necessary operations to prepare the execution of the + reconstruction traysegment. - This method is expected to perform "expensive" operations such as fetching spline data and initializing IceTray spline services. + This method is expected to perform "expensive" operations such + as fetching spline data and initializing IceTray spline + services. """ pass diff --git a/skymap_scanner/recos/dummy.py b/skymap_scanner/recos/dummy.py index a753ffc09..9277b38ce 100644 --- a/skymap_scanner/recos/dummy.py +++ b/skymap_scanner/recos/dummy.py @@ -34,8 +34,8 @@ def __init__(self): self.refine_time = True self.add_fallback_position = False - def setup_reco(self): - pass + def setup_reco(self, logger): + logger.info("Dummy reco has nothing to setup :)") @staticmethod def get_vertex_variations() -> List[dataclasses.I3Position]: diff --git a/skymap_scanner/recos/millipede_original.py b/skymap_scanner/recos/millipede_original.py index 2ef5cb34f..3f3b859ab 100644 --- a/skymap_scanner/recos/millipede_original.py +++ b/skymap_scanner/recos/millipede_original.py @@ -97,7 +97,7 @@ def __init__(self): self.refine_time = False self.add_fallback_position = False - def setup_reco(self): + def setup_reco(self, logger): datastager = self.get_datastager() datastager.stage_files(self.SPLINE_REQUIREMENTS) @@ -105,7 +105,9 @@ def setup_reco(self): abs_spline = datastager.get_filepath(self.MIE_ABS_SPLINE) prob_spline = datastager.get_filepath(self.MIE_PROB_SPLINE) + logger.info("Starting I3PhotoSplineService...") self.cascade_service = photonics_service.I3PhotoSplineService(abs_spline, prob_spline, timingSigma=0.0) + logger.info("Started I3PhotoSplineService.") self.cascade_service.SetEfficiencies(self.SPEScale) diff --git a/skymap_scanner/recos/millipede_wilks.py b/skymap_scanner/recos/millipede_wilks.py index ee3a970fd..6f7d901c9 100644 --- a/skymap_scanner/recos/millipede_wilks.py +++ b/skymap_scanner/recos/millipede_wilks.py @@ -55,11 +55,11 @@ def __init__(self): @staticmethod def get_vertex_variations() -> List[dataclasses.I3Position]: - """Returns a list of vectors referenced to the origin that will be used to generate the vertex position variations. - """ + """Returns a list of vectors referenced to the origin that will be used + to generate the vertex position variations.""" return VertexGenerator.point() - def setup_reco(self): + def setup_reco(self, logger): datastager = self.get_datastager() datastager.stage_files(self.SPLINE_REQUIREMENTS) @@ -70,6 +70,7 @@ def setup_reco(self): effp_spline: str = datastager.get_filepath(self.FTP_EFFP_SPLINE) tmod_spline: str = datastager.get_filepath(self.FTP_TMOD_SPLINE) + logger.info("Starting I3PhotoSplineService...") self.cascade_service = photonics_service.I3PhotoSplineService( abs_spline, prob_spline, timingSigma=0.0, effectivedistancetable = effd_spline, @@ -78,6 +79,7 @@ def setup_reco(self): effectivedistancetableprob = effp_spline, effectivedistancetabletmod = tmod_spline ) + logger.info("Started I3PhotoSplineService.") self.muon_service = None diff --git a/skymap_scanner/recos/splinempe.py b/skymap_scanner/recos/splinempe.py index 96fda512c..db5d9a824 100644 --- a/skymap_scanner/recos/splinempe.py +++ b/skymap_scanner/recos/splinempe.py @@ -264,7 +264,7 @@ def extract_seed(frame): def get_vertex_variations(self): return VertexGenerator.cylinder() - def setup_reco(self): + def setup_reco(self, logger): datastager = self.get_datastager() datastager.stage_files(self.SPLINE_REQUIREMENTS) @@ -274,6 +274,7 @@ def setup_reco(self): StochTimingSpline: str = datastager.get_filepath(self.MIE_STOCH_PROB) StochAmplitudeSpline: str = datastager.get_filepath(self.MIE_STOCH_ABS) + logger.info("Starting I3PhotoSplineServices...") self.bare_mu_spline = I3PhotoSplineService( BareMuAmplitudeSpline, BareMuTimingSpline, @@ -289,10 +290,11 @@ def setup_reco(self): BareMuTimingSpline, timingSigma=1000, ) + logger.info("Started I3PhotoSplineServices.") @traysegment def traysegment(self, tray, name, logger, **kwargs): - """SplineMPE reco""" + """SplineMPE reco.""" def checkName(frame: I3Frame, name: str) -> None: if name not in frame: From 75dfa3e5ab100a962f758654e078af0f5bda353d Mon Sep 17 00:00:00 2001 From: Ric Evans Date: Mon, 2 Oct 2023 18:02:40 -0500 Subject: [PATCH 93/93] ls /dev/shm after init (at top of reco) --- skymap_scanner/client/reco_icetray.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skymap_scanner/client/reco_icetray.py b/skymap_scanner/client/reco_icetray.py index 94a0c351f..d26967950 100644 --- a/skymap_scanner/client/reco_icetray.py +++ b/skymap_scanner/client/reco_icetray.py @@ -280,6 +280,8 @@ def main() -> None: ) logging_tools.log_argparse_args(args, logger=LOGGER, level="WARNING") + LOGGER.critical(f'/dev/shm: {os.listdir("/dev/shm")}') + # get PFrame with open(args.in_pkl, "rb") as f: msg = pickle.load(f)