Skip to content

Commit

Permalink
Major NRPy+ update: Make in_progress-GiRaFFE_NRPy/Tutorial-Start_to_F…
Browse files Browse the repository at this point in the history 
…inish_UnitTest-* run again.
  • Loading branch information
@zachetienne
zachetienne committed Dec 29, 2022
1 parent 4314d35 commit 3e17766
Show file tree
Hide file tree
Showing 12 changed files with 216 additions and 258 deletions.
2 changes: 1 addition & 1 deletion UnitTesting/core_Jupyter_notebook_testsuite_GiRonly.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e # Error out if any commands complete with an error.

# Run GiRaFFE unit tests first:
for i in in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish-GiRaFFE_NRPy-1D_tests-staggered.ipynb in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish_UnitTest*; do
for i in in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish-GiRaFFE_NRPy-1D_tests-staggered.ipynb in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish_UnitTest*.ipynb; do
./run_Jupyter_notebook.sh $i # notimer
cat $i | sed "s/\\\r\\\n/\\\n/g" > $i-new && mv $i-new $i
git diff $i |grep -v "image/png"|grep -E "^\-|^\+"|grep -v '^\-\-\-'| \
Expand Down
122 changes: 61 additions & 61 deletions in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish-GiRaFFE_NRPy-1D_tests-staggered.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@
"execution_count": 1,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:13:56.374582Z",
"iopub.status.busy": "2022-11-24T14:13:56.374478Z",
"iopub.status.idle": "2022-11-24T14:13:56.566735Z",
"shell.execute_reply": "2022-11-24T14:13:56.566431Z"
"iopub.execute_input": "2022-12-29T10:00:02.778574Z",
"iopub.status.busy": "2022-12-29T10:00:02.778242Z",
"iopub.status.idle": "2022-12-29T10:00:03.074294Z",
"shell.execute_reply": "2022-12-29T10:00:03.073679Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -153,10 +153,10 @@
"execution_count": 2,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:13:56.568589Z",
"iopub.status.busy": "2022-11-24T14:13:56.568507Z",
"iopub.status.idle": "2022-11-24T14:14:08.909341Z",
"shell.execute_reply": "2022-11-24T14:14:08.909077Z"
"iopub.execute_input": "2022-12-29T10:00:03.078166Z",
"iopub.status.busy": "2022-12-29T10:00:03.077995Z",
"iopub.status.idle": "2022-12-29T10:00:17.832567Z",
"shell.execute_reply": "2022-12-29T10:00:17.831925Z"
}
},
"outputs": [
Expand Down Expand Up @@ -194,10 +194,10 @@
"execution_count": 3,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:08.910853Z",
"iopub.status.busy": "2022-11-24T14:14:08.910771Z",
"iopub.status.idle": "2022-11-24T14:14:08.917926Z",
"shell.execute_reply": "2022-11-24T14:14:08.917668Z"
"iopub.execute_input": "2022-12-29T10:00:17.834245Z",
"iopub.status.busy": "2022-12-29T10:00:17.834123Z",
"iopub.status.idle": "2022-12-29T10:00:17.843861Z",
"shell.execute_reply": "2022-12-29T10:00:17.842959Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -237,10 +237,10 @@
"execution_count": 4,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:08.919275Z",
"iopub.status.busy": "2022-11-24T14:14:08.919203Z",
"iopub.status.idle": "2022-11-24T14:14:08.925172Z",
"shell.execute_reply": "2022-11-24T14:14:08.924960Z"
"iopub.execute_input": "2022-12-29T10:00:17.846865Z",
"iopub.status.busy": "2022-12-29T10:00:17.846737Z",
"iopub.status.idle": "2022-12-29T10:00:17.855154Z",
"shell.execute_reply": "2022-12-29T10:00:17.854778Z"
}
},
"outputs": [
Expand Down Expand Up @@ -302,10 +302,10 @@
"execution_count": 5,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:08.926450Z",
"iopub.status.busy": "2022-11-24T14:14:08.926378Z",
"iopub.status.idle": "2022-11-24T14:14:09.795812Z",
"shell.execute_reply": "2022-11-24T14:14:09.795561Z"
"iopub.execute_input": "2022-12-29T10:00:17.857001Z",
"iopub.status.busy": "2022-12-29T10:00:17.856866Z",
"iopub.status.idle": "2022-12-29T10:00:18.874096Z",
"shell.execute_reply": "2022-12-29T10:00:18.873217Z"
}
},
"outputs": [
Expand Down Expand Up @@ -434,10 +434,10 @@
"execution_count": 6,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:09.797404Z",
"iopub.status.busy": "2022-11-24T14:14:09.797320Z",
"iopub.status.idle": "2022-11-24T14:14:09.800788Z",
"shell.execute_reply": "2022-11-24T14:14:09.800530Z"
"iopub.execute_input": "2022-12-29T10:00:18.875853Z",
"iopub.status.busy": "2022-12-29T10:00:18.875713Z",
"iopub.status.idle": "2022-12-29T10:00:18.879727Z",
"shell.execute_reply": "2022-12-29T10:00:18.879330Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -495,10 +495,10 @@
"execution_count": 7,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:09.802099Z",
"iopub.status.busy": "2022-11-24T14:14:09.802024Z",
"iopub.status.idle": "2022-11-24T14:14:09.823674Z",
"shell.execute_reply": "2022-11-24T14:14:09.823460Z"
"iopub.execute_input": "2022-12-29T10:00:18.881372Z",
"iopub.status.busy": "2022-12-29T10:00:18.881253Z",
"iopub.status.idle": "2022-12-29T10:00:18.909542Z",
"shell.execute_reply": "2022-12-29T10:00:18.908769Z"
}
},
"outputs": [
Expand Down Expand Up @@ -550,10 +550,10 @@
"execution_count": 8,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:09.825037Z",
"iopub.status.busy": "2022-11-24T14:14:09.824965Z",
"iopub.status.idle": "2022-11-24T14:14:09.827207Z",
"shell.execute_reply": "2022-11-24T14:14:09.827007Z"
"iopub.execute_input": "2022-12-29T10:00:18.911701Z",
"iopub.status.busy": "2022-12-29T10:00:18.911557Z",
"iopub.status.idle": "2022-12-29T10:00:18.914873Z",
"shell.execute_reply": "2022-12-29T10:00:18.914375Z"
}
},
"outputs": [],
Expand All @@ -578,10 +578,10 @@
"execution_count": 9,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:09.828615Z",
"iopub.status.busy": "2022-11-24T14:14:09.828544Z",
"iopub.status.idle": "2022-11-24T14:14:09.833433Z",
"shell.execute_reply": "2022-11-24T14:14:09.833225Z"
"iopub.execute_input": "2022-12-29T10:00:18.916930Z",
"iopub.status.busy": "2022-12-29T10:00:18.916787Z",
"iopub.status.idle": "2022-12-29T10:00:18.922821Z",
"shell.execute_reply": "2022-12-29T10:00:18.922199Z"
}
},
"outputs": [
Expand Down Expand Up @@ -826,10 +826,10 @@
"execution_count": 10,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:09.834702Z",
"iopub.status.busy": "2022-11-24T14:14:09.834630Z",
"iopub.status.idle": "2022-11-24T14:14:38.800167Z",
"shell.execute_reply": "2022-11-24T14:14:38.799825Z"
"iopub.execute_input": "2022-12-29T10:00:18.924577Z",
"iopub.status.busy": "2022-12-29T10:00:18.924458Z",
"iopub.status.idle": "2022-12-29T10:00:59.105499Z",
"shell.execute_reply": "2022-12-29T10:00:59.104619Z"
}
},
"outputs": [
Expand All @@ -839,18 +839,18 @@
"text": [
"Compiling executable...\n",
"(EXEC): Executing `gcc -std=gnu99 -Ofast -fopenmp -march=native -funroll-loops GiRaFFE_staggered_1D_Tests_standalone_Ccodes/GiRaFFE_NRPy_standalone.c -o GiRaFFE_staggered_1D_Tests_standalone_Ccodes/output/GiRaFFE_NRPy_standalone -lm`...\n",
"(BENCH): Finished executing in 3.41 seconds.\n",
"(BENCH): Finished executing in 3.61 seconds.\n",
"Finished compilation.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./GiRaFFE_NRPy_standalone 299 4 4 AlfvenWave`...\n",
"(BENCH): Finished executing in 7.41 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./GiRaFFE_NRPy_standalone 299 4 4 ThreeAlfvenWaves`...\n",
"(BENCH): Finished executing in 7.61 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./GiRaFFE_NRPy_standalone 299 4 4 ThreeAlfvenWaves`...\n",
"(BENCH): Finished executing in 7.41 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./GiRaFFE_NRPy_standalone 299 4 4 DegenAlfvenWave`...\n",
"(BENCH): Finished executing in 7.01 seconds.\n",
"(BENCH): Finished executing in 6.81 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./GiRaFFE_NRPy_standalone 299 4 4 FastWave`...\n",
"(BENCH): Finished executing in 7.21 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./GiRaFFE_NRPy_standalone 299 4 4 FFEBD`...\n",
"(BENCH): Finished executing in 7.61 seconds.\n"
"(BENCH): Finished executing in 7.41 seconds.\n"
]
}
],
Expand Down Expand Up @@ -898,10 +898,10 @@
"execution_count": 11,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:38.801673Z",
"iopub.status.busy": "2022-11-24T14:14:38.801433Z",
"iopub.status.idle": "2022-11-24T14:14:38.805178Z",
"shell.execute_reply": "2022-11-24T14:14:38.804915Z"
"iopub.execute_input": "2022-12-29T10:00:59.108018Z",
"iopub.status.busy": "2022-12-29T10:00:59.107453Z",
"iopub.status.idle": "2022-12-29T10:00:59.115275Z",
"shell.execute_reply": "2022-12-29T10:00:59.114739Z"
}
},
"outputs": [],
Expand Down Expand Up @@ -937,10 +937,10 @@
"execution_count": 12,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:38.806353Z",
"iopub.status.busy": "2022-11-24T14:14:38.806181Z",
"iopub.status.idle": "2022-11-24T14:14:42.542983Z",
"shell.execute_reply": "2022-11-24T14:14:42.542563Z"
"iopub.execute_input": "2022-12-29T10:00:59.118060Z",
"iopub.status.busy": "2022-12-29T10:00:59.117579Z",
"iopub.status.idle": "2022-12-29T10:01:03.477868Z",
"shell.execute_reply": "2022-12-29T10:01:03.477249Z"
},
"scrolled": true
},
Expand Down Expand Up @@ -1062,10 +1062,10 @@
"execution_count": 13,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:42.545268Z",
"iopub.status.busy": "2022-11-24T14:14:42.545106Z",
"iopub.status.idle": "2022-11-24T14:14:45.598639Z",
"shell.execute_reply": "2022-11-24T14:14:45.598141Z"
"iopub.execute_input": "2022-12-29T10:01:03.479770Z",
"iopub.status.busy": "2022-12-29T10:01:03.479581Z",
"iopub.status.idle": "2022-12-29T10:01:07.574836Z",
"shell.execute_reply": "2022-12-29T10:01:07.574189Z"
}
},
"outputs": [
Expand Down Expand Up @@ -1122,10 +1122,10 @@
"execution_count": 14,
"metadata": {
"execution": {
"iopub.execute_input": "2022-11-24T14:14:45.604006Z",
"iopub.status.busy": "2022-11-24T14:14:45.603833Z",
"iopub.status.idle": "2022-11-24T14:14:49.220587Z",
"shell.execute_reply": "2022-11-24T14:14:49.220330Z"
"iopub.execute_input": "2022-12-29T10:01:07.585158Z",
"iopub.status.busy": "2022-12-29T10:01:07.585000Z",
"iopub.status.idle": "2022-12-29T10:01:13.050366Z",
"shell.execute_reply": "2022-12-29T10:01:13.049815Z"
}
},
"outputs": [
Expand Down
19 changes: 11 additions & 8 deletions in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish_UnitTest-GiRaFFE_NRPy-A2B.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@
"nrpy_dir_path = os.path.join(\"..\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"nrpy_dir_path = os.path.join(\"..\", \"Deprecated\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"\n",
"from outputC import outCfunction, lhrh # NRPy+: Core C code output module\n",
"import sympy as sp # SymPy: The Python computer algebra package upon which NRPy+ depends\n",
Expand Down Expand Up @@ -813,18 +816,18 @@
"\n",
"Compiling executable...\n",
"(EXEC): Executing `gcc -std=gnu99 -Ofast -fopenmp -march=native -funroll-loops Start-to-Finish-UnitTests/A2B_UnitTest/A2B_unit_test.c -o Start-to-Finish-UnitTests/A2B_UnitTest/output/A2B_unit_test -lm`...\n",
"(BENCH): Finished executing in 0.4 seconds.\n",
"(BENCH): Finished executing in 0.60 seconds.\n",
"Finished compilation.\n",
"Finished in 0.40411925315856934 seconds.\n",
"Finished in 0.6065690517425537 seconds.\n",
"\n",
"\n",
"Now running...\n",
"\n",
"(EXEC): Executing `taskset -c 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ./A2B_unit_test 1 1 1 1`...\n",
"(BENCH): Finished executing in 0.2 seconds.\n",
"(EXEC): Executing `taskset -c 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ./A2B_unit_test 7 7 7 1`...\n",
"(BENCH): Finished executing in 0.2 seconds.\n",
"Finished in 0.44914722442626953 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./A2B_unit_test 1 1 1 1`...\n",
"(BENCH): Finished executing in 0.20 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./A2B_unit_test 7 7 7 1`...\n",
"(BENCH): Finished executing in 0.20 seconds.\n",
"Finished in 0.4562230110168457 seconds.\n",
"\n",
"\n"
]
Expand Down Expand Up @@ -1087,7 +1090,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.1"
}
},
"nbformat": 4,
Expand Down
14 changes: 7 additions & 7 deletions in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish_UnitTest-GiRaFFE_NRPy-Afield_flux.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
"nrpy_dir_path = os.path.join(\"..\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"nrpy_dir_path = os.path.join(\"..\",\"..\")\n",
"nrpy_dir_path = os.path.join(\"..\",\"Deprecated\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"\n",
Expand Down Expand Up @@ -1037,12 +1037,12 @@
"text": [
"Compiling executable...\n",
"(EXEC): Executing `gcc -std=gnu99 -Ofast -fopenmp -march=native -funroll-loops Start-to-Finish-UnitTests/Afield_flux_UnitTest/Afield_flux_unit_test.c -o Start-to-Finish-UnitTests/Afield_flux_UnitTest/output/Afield_flux_unit_test -lm`...\n",
"(BENCH): Finished executing in 0.6 seconds.\n",
"(BENCH): Finished executing in 0.80 seconds.\n",
"Finished compilation.\n",
"(EXEC): Executing `taskset -c 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ./Afield_flux_unit_test 2 2 2`...\n",
"(BENCH): Finished executing in 0.2 seconds.\n",
"(EXEC): Executing `taskset -c 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ./Afield_flux_unit_test 4 4 4`...\n",
"(BENCH): Finished executing in 0.2 seconds.\n"
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./Afield_flux_unit_test 2 2 2`...\n",
"(BENCH): Finished executing in 0.20 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./Afield_flux_unit_test 4 4 4`...\n",
"(BENCH): Finished executing in 0.20 seconds.\n"
]
}
],
Expand Down Expand Up @@ -1178,7 +1178,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.1"
}
},
"nbformat": 4,
Expand Down
14 changes: 7 additions & 7 deletions in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish_UnitTest-GiRaFFE_NRPy-BCs.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"nrpy_dir_path = os.path.join(\"..\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"nrpy_dir_path = os.path.join(\"..\",\"..\")\n",
"nrpy_dir_path = os.path.join(\"..\", \"Deprecated\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"\n",
Expand Down Expand Up @@ -519,16 +519,16 @@
"\n",
"Compiling executable...\n",
"(EXEC): Executing `gcc -std=gnu99 -Ofast -fopenmp -march=native -funroll-loops Start-to-Finish-UnitTests/BCs_UnitTest/BCs_unit_test.c -o Start-to-Finish-UnitTests/BCs_UnitTest/output/BCs_unit_test -lm`...\n",
"(BENCH): Finished executing in 0.4 seconds.\n",
"(BENCH): Finished executing in 0.60 seconds.\n",
"Finished compilation.\n",
"Finished in 0.4042809009552002 seconds.\n",
"Finished in 0.6055264472961426 seconds.\n",
"\n",
"\n",
"Now running...\n",
"\n",
"(EXEC): Executing `taskset -c 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ./BCs_unit_test 2 2 2`...\n",
"(BENCH): Finished executing in 0.2 seconds.\n",
"Finished in 0.22329187393188477 seconds.\n",
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./BCs_unit_test 2 2 2`...\n",
"(BENCH): Finished executing in 0.20 seconds.\n",
"Finished in 0.23199677467346191 seconds.\n",
"\n",
"\n"
]
Expand Down Expand Up @@ -654,7 +654,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.1"
}
},
"nbformat": 4,
Expand Down
10 changes: 5 additions & 5 deletions in_progress-GiRaFFE_NRPy/Tutorial-Start_to_Finish_UnitTest-GiRaFFE_NRPy-C2P_P2C.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"nrpy_dir_path = os.path.join(\"..\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"nrpy_dir_path = os.path.join(\"..\",\"..\")\n",
"nrpy_dir_path = os.path.join(\"..\", \"Deprecated\")\n",
"if nrpy_dir_path not in sys.path:\n",
" sys.path.append(nrpy_dir_path)\n",
"\n",
Expand Down Expand Up @@ -710,11 +710,11 @@
"text": [
"Now compiling, should take ~2 seconds...\n",
"\n",
"Finished in 0.6016302108764648 seconds.\n",
"Finished in 0.7895715236663818 seconds.\n",
"\n",
"\n",
"(EXEC): Executing `taskset -c 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15 ./C2P_P2C_unit_test `...\n",
"(BENCH): Finished executing in 0.2 seconds.\n"
"(EXEC): Executing `taskset -c 1,3,5,7,9,11,13,15 ./C2P_P2C_unit_test `...\n",
"(BENCH): Finished executing in 0.20 seconds.\n"
]
}
],
Expand Down Expand Up @@ -944,7 +944,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.10.4"
"version": "3.11.1"
}
},
"nbformat": 4,
Expand Down

0 comments on commit 3e17766

Please sign in to comment.