Update default queue to development

DesignSafe-CI · Nov 16, 2023 · ebb11d1 · ebb11d1
1 parent 6c944d1
commit ebb11d1
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 32 deletions.
diff --git a/dsjobs/jobs.py b/dsjobs/jobs.py
@@ -133,7 +133,7 @@ def generate_job_info(
     ag,
     appid: str,
     jobname: str = "dsjob",
-    queue: str = "skx-dev",
+    queue: str = "development",
     nnodes: int = 1,
     nprocessors: int = 1,
     runtime: str = "00:10:00",

diff --git a/example-notebooks/papermill-mpm.ipynb → example-notebooks/mpm/papermill-mpm.ipynb b/example-notebooks/papermill-mpm.ipynb → example-notebooks/mpm/papermill-mpm.ipynb
diff --git a/example-notebooks/template-mpm-run.ipynb → example-notebooks/mpm/template-mpm-run.ipynb b/example-notebooks/template-mpm-run.ipynb → example-notebooks/mpm/template-mpm-run.ipynb
@@ -18,7 +18,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 21,
+   "execution_count": 1,
    "id": "b7fa3e9a-7bf3-441c-917f-fb57a94ee017",
    "metadata": {},
    "outputs": [
@@ -48,7 +48,25 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 22,
+   "execution_count": 2,
+   "id": "6a0daf58-cf6c-41f9-89b7-bc60d7042e04",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "fatal: destination path '/home/jupyter/MyData/mpm-benchmarks' already exists and is not an empty directory.\n"
+     ]
+    }
+   ],
+   "source": [
+    "!git clone https://github.com/cb-geo/mpm-benchmarks ~/MyData/mpm-benchmarks"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 3,
    "id": "8593c08c-c96a-4a66-9b52-80b8b5c27e44",
    "metadata": {
     "tags": [
@@ -77,7 +95,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 23,
+   "execution_count": 4,
    "id": "91b811a4-45d9-4223-a145-c0f4e393af66",
    "metadata": {},
    "outputs": [],
@@ -98,7 +116,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 24,
+   "execution_count": 5,
    "id": "0153c5cc-f4b9-460b-b4c6-d92eb8c6ede5",
    "metadata": {},
    "outputs": [
@@ -110,9 +128,9 @@
       "---Job Info---\n",
       "\n",
       "{\n",
-      "  \"appId\": \"mpm-1.0.0\",\n",
+      "  \"appId\": \"mpm-1.1.0u3\",\n",
       "  \"name\": \"mpm-uniaxial\",\n",
-      "  \"batchQueue\": \"skx-dev\",\n",
+      "  \"batchQueue\": \"development\",\n",
       "  \"nodeCount\": 1,\n",
       "  \"processorsPerNode\": 1,\n",
       "  \"memoryPerNode\": \"1\",\n",
@@ -138,7 +156,7 @@
     "\n",
     "# generate and modify job info\n",
     "job_info = ds.generate_job_info(\n",
-    "    ag, appid=\"mpm-1.0.0\", jobname=\"mpm-uniaxial\", runtime=duration\n",
+    "    ag, appid=\"mpm-1.1.0u3\", jobname=\"mpm-uniaxial\", runtime=duration\n",
     ")\n",
     "\n",
     "# specify input path and file\n",
@@ -157,7 +175,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 25,
+   "execution_count": 6,
    "id": "4e6dc010-d821-45d5-805b-84620363f468",
    "metadata": {},
    "outputs": [],
@@ -167,15 +185,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 26,
+   "execution_count": 7,
    "id": "06dd17dc-2540-46b3-9036-3245a9b6cfae",
    "metadata": {},
    "outputs": [
     {
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Waiting for job to start: 2it [00:30, 15.13s/it, Status: RUNNING]   \n",
+      "Waiting for job to start: 2it [00:30, 15.09s/it, Status: RUNNING]\n",
       "Monitoring job:   0%|                                                        | 0/40 [00:00<?, ?it/s]"
      ]
     },
@@ -190,7 +208,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Monitoring job:  10%|████▊                                           | 4/40 [01:00<09:04, 15.13s/it]"
+      "Monitoring job:  10%|████▊                                           | 4/40 [01:00<09:03, 15.08s/it]"
      ]
     },
     {
@@ -204,7 +222,7 @@
      "name": "stderr",
      "output_type": "stream",
      "text": [
-      "Monitoring job:  12%|██████                                          | 5/40 [01:15<08:50, 15.15s/it]"
+      "Monitoring job:  12%|██████                                          | 5/40 [01:15<08:49, 15.13s/it]"
      ]
     },
     {
@@ -227,7 +245,7 @@
        "'FINISHED'"
       ]
      },
-     "execution_count": 26,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -238,7 +256,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 27,
+   "execution_count": 8,
    "id": "614f3568-d290-44d9-896d-608375293a58",
    "metadata": {},
    "outputs": [
@@ -248,17 +266,10 @@
      "text": [
       "Runtime Summary\n",
       "---------------\n",
-      "PENDING             time: 0:00:00\n",
-      "PROCESSING_INPUTS   time: 0:00:03\n",
-      "STAGING_INPUTS      time: 0:00:05\n",
-      "STAGED              time: 0:00:00\n",
-      "STAGING_JOB         time: 0:00:03\n",
-      "SUBMITTING          time: 0:00:06\n",
-      "QUEUED              time: 0:00:05\n",
-      "RUNNING             time: 0:01:09\n",
-      "CLEANING_UP         time: 0:00:00\n",
-      "ARCHIVING           time: 0:00:08\n",
-      "TOTAL               time: 0:01:39\n",
+      "PENDING   time: 0:00:00\n",
+      "QUEUED    time: 0:00:05\n",
+      "RUNNING   time: 0:01:09\n",
+      "TOTAL     time: 0:01:35\n",
       "---------------\n"
      ]
     }
@@ -269,10 +280,21 @@
   },
   {
    "cell_type": "code",
-   "execution_count": null,
+   "execution_count": 9,
    "id": "5e2c642e-88c3-42be-acb6-2966cc31f90c",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "'Transitioning from status ARCHIVING to FINISHED in phase ARCHIVING.'"
+      ]
+     },
+     "execution_count": 9,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
     "ag.jobs.get(jobId=job[\"id\"])[\"lastStatusMessage\"]"
    ]
@@ -287,17 +309,17 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 20,
+   "execution_count": 10,
    "id": "daf7f33a-594c-4a69-b2d3-bc39a434d154",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "'/home/jupyter/MyData/archive/jobs/job-8d70a2b2-9295-4233-bade-9cc1834e9603-007'"
+       "'/home/jupyter/MyData/archive/jobs/job-7f1dcdf6-e747-47f0-9266-f210454faf13-007'"
       ]
      },
-     "execution_count": 20,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }

diff --git a/tests/test_job_gen_jobinfo.py b/tests/test_job_gen_jobinfo.py
@@ -39,7 +39,7 @@ def test_default_values(self):
         """Test with default values."""
         result = jobs.generate_job_info(self.ag_mock, self.appid_valid)
         self.assertEqual(result["name"], "dsjob")
-        self.assertEqual(result["batchQueue"], "skx-dev")
+        self.assertEqual(result["batchQueue"], "development")
         self.assertEqual(result["nodeCount"], 1)
         self.assertEqual(result["processorsPerNode"], 1)
         self.assertEqual(result["maxRunTime"], "00:10:00")