--force in all sh's, new run_CPU_CI.sh and run_GPU_CI.sh, new guids (#2242)

robmariv · web-flow · commit 195b74741022 · 2024-03-21T07:48:20.000-07:00
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/build_denoise.sh b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/build_denoise.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-## source /opt/intel/inteloneapi/setvars.sh
 source /opt/intel/oneapi/setvars.sh --force
 
 export rkcommon_DIR=/opt/intel/oneapi/rkcommon/latest/lib/cmake/rkcommon
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/build_tutorial.sh b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/build_tutorial.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
-## source /opt/intel/inteloneapi/setvars.sh
-source /opt/intel/oneapi/setvars.sh --force
+ource /opt/intel/oneapi/setvars.sh --force
 
 export rkcommon_DIR=/opt/intel/oneapi/rkcommon/latest/lib/cmake/rkcommon
 
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_denoise.sh b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_denoise.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-## source /opt/intel/oneapi/embree/latest/env/vars.sh
-## source /opt/intel/oneapi/openvkl/latest/env/vars.sh
-## source /opt/intel/oneapi/rkcommon/latest/env/vars.sh
-## source /opt/intel/oneapi/ospray/latest/env/vars.sh
-## source /opt/intel/oneapi/setvars.sh --force > /dev/null
 source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 /bin/echo "##" $(whoami) "is running OSPRay_Intro with denoise (ospTutorial_denoise)"
 bin/ospTutorialDenoise
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_tutorial_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_tutorial_CPU.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-## source /opt/intel/oneapi/embree/latest/env/vars.sh
-## source /opt/intel/oneapi/openvkl/latest/env/vars.sh
-## source /opt/intel/oneapi/rkcommon/latest/env/vars.sh
-## source /opt/intel/oneapi/ospray/latest/env/vars.sh
-## source /opt/intel/oneapi/setvars.sh --force > /dev/null
 source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 /bin/echo "Running ospTutorial targeting the CPU with the command:"
 /bin/echo
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_tutorial_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_tutorial_GPU.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-## source /opt/intel/oneapi/embree/latest/env/vars.sh
-## source /opt/intel/oneapi/openvkl/latest/env/vars.sh
-## source /opt/intel/oneapi/rkcommon/latest/env/vars.sh
-## source /opt/intel/oneapi/ospray/latest/env/vars.sh
-## source /opt/intel/oneapi/setvars.sh --force > /dev/null
 source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 /bin/echo "Running ospTutorial targeting the CPU with the command:"
 /bin/echo
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_tutorial_MPI.sh b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/run_tutorial_MPI.sh
@@ -1,9 +1,4 @@
 #!/bin/bash
-## source /opt/intel/oneapi/embree/latest/env/vars.sh
-## source /opt/intel/oneapi/openvkl/latest/env/vars.sh
-## source /opt/intel/oneapi/rkcommon/latest/env/vars.sh
-## source /opt/intel/oneapi/ospray/latest/env/vars.sh
-## source /opt/intel/oneapi/setvars.sh --force > /dev/null
 source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 /bin/echo "Running ospTutorial with MPI with the command:"
 /bin/echo
diff --git a/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/sample.json b/RenderingToolkit/IRTK_Learning_Path/2.1_OSPRay_Intro_CPU_GPU/sample.json
@@ -1,5 +1,5 @@
 {
-  "guid": "aa3d4df0-0e61-4290-8292-c9d77bb209ab",
+  "guid": "d199b348-94f4-4660-9631-3978ad1b7647",
   "name": "OSPRAY Intro Jupyter Learning Path",
   "categories": ["Toolkit/oneAPI Libraries/OSPRay"],
   "description": "OSPRAY ospTutorial tutorial Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU and GPU",
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/build_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/build_CPU.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 
 [ ! -d build_CPU ] && mkdir -p build_CPU
 cd build_CPU
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/build_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/build_GPU.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 
 export rkcommon_DIR=/opt/intel/oneapi/rkcommon/latest/lib/cmake/rkcommon
 
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/run_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/run_CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source /opt/intel/oneapi/setvars.sh > /dev/null 2>&1
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 
 bin/minimal_CPU
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/run_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/run_GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source /opt/intel/oneapi/setvars.sh > /dev/null 2>&1
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 
 bin/minimal_sycl
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/sample.json b/RenderingToolkit/IRTK_Learning_Path/3.1_Embree_Intro_CPU_GPU/sample.json
@@ -1,5 +1,5 @@
 {
-  "guid": "8edb16f3-db2e-42cb-9d96-ac999a793b39",
+  "guid": "12b6eb25-0c7e-4150-a4dd-e9efd7304f25",
   "name": "Embree Intro Jupyter Learning Path",
   "categories": ["Toolkit/oneAPI Libraries/Embree"],
   "description": "Embree minimal Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU and GPU",
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.2_Embree_Shadow/build.sh b/RenderingToolkit/IRTK_Learning_Path/3.2_Embree_Shadow/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 
 [ ! -d build ] && mkdir -p build
 cd build
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.2_Embree_Shadow/run.sh b/RenderingToolkit/IRTK_Learning_Path/3.2_Embree_Shadow/run.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-source /opt/intel/oneapi/setvars.sh > /dev/null 2>&1
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 
 bin/minimal_shadow
diff --git a/RenderingToolkit/IRTK_Learning_Path/3.2_Embree_Shadow/sample.json b/RenderingToolkit/IRTK_Learning_Path/3.2_Embree_Shadow/sample.json
@@ -1,5 +1,5 @@
 {
-  "guid": "ef588b06-413a-492c-a2fb-1f00527ce254",
+  "guid": "61220483-bf14-41f9-a612-25aa0ee815b2",
   "name": "Embree Shadow Jupyter Learning Path",
   "categories": ["Toolkit/oneAPI Libraries/Embree"],
   "description": "Embree minimal-shadow Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU",
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/build_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/build_CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 rm -r build_CPU
 mkdir build_CPU
 cd build_CPU
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/build_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/build_GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 rm -r build_GPU
 mkdir build_GPU
 cd build_GPU
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-source /opt/intel/oneapi/setvars.sh > /dev/null 2>&1
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 /bin/echo "##" $(whoami) "is running vklMinimal_CPU_01 through 06"
 i=1
 while [ $i -le 6 ]; do
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_CPU_CI.sh b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_CPU_CI.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
+/bin/echo "##" $(whoami) "is running vklMinimal_CPU_01 through 06"
+i=1
+while [ $i -le 6 ]; do
+    case=$(printf "%02d" $i)
+    echo
+    echo "vklMinimal_CPU_$case"
+    ./bin/vklMinimal_CPU_$case
+    i=$((i + 1))
+done
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-source /opt/intel/oneapi/setvars.sh > /dev/null 2>&1
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
 /bin/echo "##" $(whoami) "is running vklMinimal_GPU_01 through 06"
 i=1
 while [ $i -le 6 ]; do
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_GPU_CI.sh b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/run_GPU_CI.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+source /opt/intel/oneapi/setvars.sh --force > /dev/null 2>&1
+/bin/echo "##" $(whoami) "is running vklMinimal_GPU_01 through 06"
+i=1
+while [ $i -le 6 ]; do
+    case=$(printf "%02d" $i)
+    echo
+    echo "vklMinimal_GPU_$case"
+    ./bin/vklMinimal_GPU_$case
+    i=$((i + 1))
+done
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/sample.json b/RenderingToolkit/IRTK_Learning_Path/4.1_OpenVKL_Intro_CPU_GPU/sample.json
@@ -1,5 +1,5 @@
 {
-  "guid": "69ac52f7-bcf4-4c26-b4ac-f9b571608992",
+  "guid": "9bd9f57c-07a1-4514-a0fd-a79652947d21",
   "name": "OpenVkL Intro Jupyter Learning Path",
   "categories": ["Toolkit/oneAPI Libraries/Open VKL"],
   "description": "Open VKL minimal Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU and GPU",
@@ -15,9 +15,9 @@
                 "id": "OpenVkL_Intro_Jupyter_Learning_Path_Linux",
                 "steps": [
                     "sh ./build_CPU.sh",
-                    "sh ./run_CPU.sh",
+                    "sh ./run_CPU_CI.sh",
 		                "sh ./build_GPU.sh",
-		                "sh ./run_GPU.sh"
+		                "sh ./run_GPU_CI.sh"
                  ]
                  }
         ]
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/build_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/build_CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 
 /bin/echo "##" $(whoami) is building vklTutorialCPU
 [ ! -d build ] && mkdir -p build
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/build_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/build_GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 
 /bin/echo "##" $(whoami) is building vklTutorialGPU
 [ ! -d build ] && mkdir -p build
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/run_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/run_CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh &>/dev/null
+source /opt/intel/oneapi/setvars.sh --force &>/dev/null
 
 /bin/echo "##" $(whoami) is running vklTutorialCPU
 bin/vklTutorialCPU
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/run_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/run_GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh &>/dev/null
+source /opt/intel/oneapi/setvars.sh --force &>/dev/null
 
 /bin/echo "##" $(whoami) is running vklTutorialGPU
 bin/vklTutorialGPU
diff --git a/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/sample.json b/RenderingToolkit/IRTK_Learning_Path/4.2_OpenVKL_Tutorial/sample.json
@@ -1,5 +1,5 @@
 {
-  "guid": "35dbab4a-140d-4d03-a04d-a2821f805d7b",
+  "guid": "3ee2d431-82bb-4638-80cb-4138b1640025",
   "name": "OpenVkL Tutorial Jupyter Learning Path",
   "categories": ["Toolkit/oneAPI Libraries/Open VKL"],
   "description": "Open VKL tutorial Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU and GPU",
diff --git a/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/build.sh b/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh
+source /opt/intel/oneapi/setvars.sh --force
 [ -d build ] && rm -rf build
 mkdir build
 cd build
diff --git a/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/run_CPU.sh b/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/run_CPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh &>/dev/null
+source /opt/intel/oneapi/setvars.sh --force &>/dev/null
 /bin/echo "##" $(whoami) is running ./bin/oidnDenoise
 ./bin/oidnDenoise -d cpu \
 -hdr /home/common/data/Big_Data/IRTK_BD/OIDN_BD/images/JunkShop_00064spp.hdr.pfm \
diff --git a/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/run_GPU.sh b/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/run_GPU.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-source /opt/intel/oneapi/setvars.sh &>/dev/null
+source /opt/intel/oneapi/setvars.sh --force &>/dev/null
 /bin/echo "##" $(whoami) is running ./bin/oidnDenoise
 ./bin/oidnDenoise -d sycl \
 -hdr /home/common/data/Big_Data/IRTK_BD/OIDN_BD/images/JunkShop_00064spp.hdr.pfm \
diff --git a/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/sample.json b/RenderingToolkit/IRTK_Learning_Path/5_OIDN_Intro_CPU_GPU/sample.json
@@ -1,5 +1,5 @@
 {
-  "guid": "aa0383a1-f4d1-4ccf-bc60-2e7f0979f0f3",
+  "guid": "895233da-3692-4506-b8cc-100bf3216a1c",
   "name": "OIDN Intro Jupyter Learning Path",
   "categories": ["Toolkit/oneAPI Libraries/Open Image Denoise"],
   "description": "Open Image Denoise minimal Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU and GPU",
diff --git a/RenderingToolkit/IRTK_Learning_Path/Overview.ipynb b/RenderingToolkit/IRTK_Learning_Path/Overview.ipynb
@@ -51,7 +51,7 @@
     "## Module 2.1.a) [How to target CPU and GPU with OSPRay](2.1_OSPRay_Intro_CPU_GPU/OSPRay_tutorial_CPU_GPU.ipynb)\n",
     "An introduction to OSPRay, a high-performance ray-tracing renderer for scientific visualization and high-fidelity photorealistic rendering.\n",
     "\n",
-    "## Module 2.1.a) [How to implement OIDN in OSPRay](2.1_OSPRay_Intro_CPU_GPU/OSPRay_tutorial_denoise.ipynb)\n",
+    "## Module 2.1.b) [How to implement OIDN in OSPRay](2.1_OSPRay_Intro_CPU_GPU/OSPRay_tutorial_denoise.ipynb)\n",
     "An introduction to OSPRay, a high-performance ray-tracing renderer for scientific visualization and high-fidelity photorealistic rendering.\n",
     "\n",
     "<!-- ## Under construction:\n",
@@ -107,7 +107,7 @@
     "***\n",
     "\n",
     "# Intel® Open Image Denoise\n",
-    "## Module 5) [How to target CPU and GPU with OIDN](5.1_OIDN_Intro_CPU_GPU/OIDN_Intro_CPU_GPU.ipynb)\n",
+    "## Module 5) [How to target CPU and GPU with OIDN](5_OIDN_Intro_CPU_GPU/OIDN_Intro_CPU_GPU.ipynb)\n",
     "Code walkthrough of the Intel Open Image Denoise library and procedure to target CPU and GPU devices."
    ]
   },

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`#!/bin/bash`
`2`		`-## source /opt/intel/inteloneapi/setvars.sh`
`3`	`2`	`source /opt/intel/oneapi/setvars.sh --force`
`4`	`3`
`5`	`4`	`export rkcommon_DIR=/opt/intel/oneapi/rkcommon/latest/lib/cmake/rkcommon`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "guid": "aa3d4df0-0e61-4290-8292-c9d77bb209ab",`
	`2`	`+ "guid": "d199b348-94f4-4660-9631-3978ad1b7647",`
`3`	`3`	`"name": "OSPRAY Intro Jupyter Learning Path",`
`4`	`4`	`"categories": ["Toolkit/oneAPI Libraries/OSPRay"],`
`5`	`5`	`"description": "OSPRAY ospTutorial tutorial Jupyter notebook of Intel Developer Cloud Learning Path targeting CPU and GPU",`