diff --git a/plot.ipynb b/plot.ipynb index 1dfbc18..14955f3 100644 --- a/plot.ipynb +++ b/plot.ipynb @@ -39,7 +39,7 @@ }, { "cell_type": "code", - "execution_count": 86, + "execution_count": 133, "metadata": {}, "outputs": [ { @@ -70,7 +70,32 @@ }, { "cell_type": "code", - "execution_count": 87, + "execution_count": 134, + "metadata": {}, + "outputs": [ + { + "data": { + "text/plain": [ + "{'haswell': {'peak_flop': 332800000000.0,\n", + " 'peak_flop_linpack': 262500000000.0,\n", + " 'peak_bw': 38480000000.0},\n", + " 'skylake': {'peak_flop': 1075200000000.0,\n", + " 'peak_flop_linpack': 678800000000.0,\n", + " 'peak_bw': 36600000000.0}}" + ] + }, + "execution_count": 134, + "metadata": {}, + "output_type": "execute_result" + } + ], + "source": [ + "cpu" + ] + }, + { + "cell_type": "code", + "execution_count": 135, "metadata": {}, "outputs": [], "source": [ @@ -89,19 +114,20 @@ }, { "cell_type": "code", - "execution_count": 67, + "execution_count": 155, "metadata": {}, "outputs": [], "source": [ "# forms by meshes\n", "plt.close('all')\n", - "plt.figure(figsize=(12, 12))\n", + "plt.figure(figsize=(12, 6))\n", "\n", - "forms = [\"mass\", \"helmholtz\", \"laplacian\", \"elasticity\", \"hyperelasticity\"]\n", + "# forms = [\"mass\", \"helmholtz\", \"laplacian\", \"elasticity\", \"hyperelasticity\"]\n", + "forms = [\"helmholtz\", \"elasticity\"]\n", "meshes = [\"tri\", \"quad\", \"tet\", \"hex\"]\n", "platform = \"skylake\" # haswell or skylake\n", "hyperthreading = True\n", - "vec = \"ve\" # omp or ve\n", + "vec = \"omp\" # omp or ve\n", "\n", "if platform == \"haswell\":\n", " simd = \"4\"\n", @@ -184,7 +210,7 @@ }, { "cell_type": "code", - "execution_count": 88, + "execution_count": 98, "metadata": {}, "outputs": [], "source": [ @@ -192,7 +218,8 @@ "plt.close('all')\n", "plt.figure(figsize=(16, 5))\n", "\n", - "platform = \"skylake\" # haswell or skylake\n", + "platform = \"haswell\" # haswell or skylake\n", + "forms = [\"mass\", \"helmholtz\", \"laplacian\", \"elasticity\", \"hyperelasticity\"]\n", "forms = [\"mass\", \"helmholtz\", \"laplacian\", \"elasticity\", \"hyperelasticity\"]\n", "meshes = [\"tri\", \"quad\", \"tet\", \"hex\"]\n", "compiler = \"gcc\"\n", @@ -269,7 +296,7 @@ }, { "cell_type": "code", - "execution_count": 94, + "execution_count": 105, "metadata": {}, "outputs": [], "source": [ @@ -316,7 +343,7 @@ }, { "cell_type": "code", - "execution_count": 96, + "execution_count": 106, "metadata": {}, "outputs": [ { diff --git a/run_many_oneforms.sh b/run_many_oneforms.sh index d35f5d3..8a05ded 100755 --- a/run_many_oneforms.sh +++ b/run_many_oneforms.sh @@ -17,10 +17,10 @@ then fi else batchsize=(1 8) - if [ $hyperthreading == 1] + if [ $hyperthreading == 1 ] then export TJ_NP=32 - export TJ_MPI_MAP_BY="hwthreads" + export TJ_MPI_MAP_BY="hwthread" else export TJ_NP=16 export TJ_MPI_MAP_BY="core"