Merge pull request #93 from xdslproject/rename_again_for_imports

misc: Rename folders again for imports
xdslproject · May 22, 2024 · 134f237 · 134f237
2 parents 5f30fdd + 5ff2198
commit 134f237
Show file tree

Hide file tree

Showing 53 changed files with 15 additions and 14 deletions.
diff --git a/xdsl-examples/.gitignore → xdsl_examples/.gitignore b/xdsl-examples/.gitignore → xdsl_examples/.gitignore
diff --git a/xdsl-examples/README.md → xdsl_examples/README.md b/xdsl-examples/README.md → xdsl_examples/README.md
diff --git a/xdsl-examples/__init__.py → xdsl_examples/__init__.py b/xdsl-examples/__init__.py → xdsl_examples/__init__.py
diff --git a/xdsl-examples/bench_utils.py → xdsl_examples/bench_utils.py b/xdsl-examples/bench_utils.py → xdsl_examples/bench_utils.py
diff --git a/xdsl-examples/diffusion_2D_wBCs.py → xdsl_examples/diffusion_2D_wBCs.py b/xdsl-examples/diffusion_2D_wBCs.py → xdsl_examples/diffusion_2D_wBCs.py
@@ -8,7 +8,8 @@
 from devito import (Grid, TimeFunction, Eq, solve, Operator,
                     Constant, norm, configuration)
 from examples.cfd import init_hat
-from fast.bench_utils import plot_2dfunc
+from xdsl_examples.bench_utils import plot_2dfunc
+
 
 parser = argparse.ArgumentParser(description='Process arguments.')
 
@@ -22,10 +23,11 @@
                     type=int, help="Simulation time in millisecond")
 parser.add_argument("-bls", "--blevels", default=2, type=int, nargs="+",
                     help="Block levels")
-parser.add_argument("-plot", "--plot", default=False, type=bool, help="Plot2D")
 parser.add_argument("-devito", "--devito", default=False, type=bool, help="Devito run")
 parser.add_argument("-xdsl", "--xdsl", default=False, type=bool, help="xDSL run")
 args = parser.parse_args()
+parser.add_argument("-plot", "--plot", default=False, type=bool, help="Plot2D")
+
 
 mpiconf = configuration['mpi']
 

diff --git a/xdsl-examples/diffusion_3D_wBCs.py → xdsl_examples/diffusion_3D_wBCs.py b/xdsl-examples/diffusion_3D_wBCs.py → xdsl_examples/diffusion_3D_wBCs.py
@@ -7,7 +7,7 @@
 
 from devito import (Grid, TimeFunction, Eq, solve, Constant,
                     norm, Operator, configuration)
-from fast.bench_utils import plot_3dfunc
+from xdsl_examples.bench_utils import plot_3dfunc
 
 parser = argparse.ArgumentParser(description='Process arguments.')
 

diff --git a/xdsl-examples/elastic2d.py → xdsl_examples/elastic2d.py b/xdsl-examples/elastic2d.py → xdsl_examples/elastic2d.py
@@ -43,8 +43,6 @@
                     type=int, help="Space order of the simulation")
 parser.add_argument("-nt", "--nt", default=40,
                     type=int, help="Simulation time in millisecond")
-parser.add_argument("-plot", "--plot", default=False, type=bool, help="Plot3D")
-
 parser.add_argument("-devito", "--devito", default=False, type=bool, help="Devito run")
 parser.add_argument("-xdsl", "--xdsl", default=False, type=bool, help="xDSL run")
 parser.add_argument("-plot", "--plot", default=False, type=bool, help="Plot2D")
@@ -170,11 +168,11 @@ def wavelet(self, f0, t):
 
 if args.plot:
     # Save the plotted images locally
-    plt.imsave('/home/gb4018/workspace/xdslproject/devito/fast/v0.pdf', v[0].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
-    plt.imsave('/home/gb4018/workspace/xdslproject/devito/fast/v1.pdf', v[1].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
-    plt.imsave('/home/gb4018/workspace/xdslproject/devito/fast/tau00.pdf', tau[0, 0].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
-    plt.imsave('/home/gb4018/workspace/xdslproject/devito/fast/tau11.pdf', tau[1, 1].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
-    plt.imsave('/home/gb4018/workspace/xdslproject/devito/fast/tau01.pdf', tau[0, 1].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
+    plt.imsave('/home/gb4018/workspace/xdslproject/devito/xdsl-examples/v0.pdf', v[0].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
+    plt.imsave('/home/gb4018/workspace/xdslproject/devito/xdsl-examples/v1.pdf', v[1].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
+    plt.imsave('/home/gb4018/workspace/xdslproject/devito/xdsl-examples/tau00.pdf', tau[0, 0].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
+    plt.imsave('/home/gb4018/workspace/xdslproject/devito/xdsl-examples/tau11.pdf', tau[1, 1].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
+    plt.imsave('/home/gb4018/workspace/xdslproject/devito/xdsl-examples/tau01.pdf', tau[0, 1].data_with_halo[0], vmin=-.5*1e-2, vmax=.5*1e-2, cmap="seismic")
 
 assert np.allclose(v_xdsl[0].data, v[0].data, rtol=1e-8)
 assert np.allclose(v_xdsl[1].data, v[1].data, rtol=1e-8)

diff --git a/xdsl-examples/gpu.sh → xdsl_examples/gpu.sh b/xdsl-examples/gpu.sh → xdsl_examples/gpu.sh
diff --git a/xdsl-examples/job-devito-xdsl-wave.slurm → xdsl_examples/job-devito-xdsl-wave.slurm b/xdsl-examples/job-devito-xdsl-wave.slurm → xdsl_examples/job-devito-xdsl-wave.slurm
diff --git a/xdsl-examples/job-devito-xdsl.slurm → xdsl_examples/job-devito-xdsl.slurm b/xdsl-examples/job-devito-xdsl.slurm → xdsl_examples/job-devito-xdsl.slurm
diff --git a/xdsl-examples/mpi.sh → xdsl_examples/mpi.sh b/xdsl-examples/mpi.sh → xdsl_examples/mpi.sh
diff --git a/xdsl-examples/openmp.sh → xdsl_examples/openmp.sh b/xdsl-examples/openmp.sh → xdsl_examples/openmp.sh
diff --git a/xdsl-examples/run_benchmark.py → xdsl_examples/run_benchmark.py b/xdsl-examples/run_benchmark.py → xdsl_examples/run_benchmark.py
diff --git a/xdsl-examples/setup.sh → xdsl_examples/setup.sh b/xdsl-examples/setup.sh → xdsl_examples/setup.sh
diff --git a/xdsl-examples/setup_wave2d.py → xdsl_examples/setup_wave2d.py b/xdsl-examples/setup_wave2d.py → xdsl_examples/setup_wave2d.py
@@ -6,7 +6,7 @@
 from devito import (TimeFunction, Eq, Operator, solve, configuration)
 from examples.seismic import RickerSource
 from examples.seismic import Model, TimeAxis
-from fast.bench_utils import plot_2dfunc
+from xdsl_examples.bench_utils import plot_2dfunc
 from devito.tools import as_tuple
 
 import argparse

diff --git a/xdsl-examples/setup_wave3d.py → xdsl_examples/setup_wave3d.py b/xdsl-examples/setup_wave3d.py → xdsl_examples/setup_wave3d.py
@@ -8,7 +8,7 @@
                     configuration)
 from examples.seismic import RickerSource
 from examples.seismic import Model, TimeAxis
-from fast.bench_utils import plot_3dfunc
+from xdsl_examples.bench_utils import plot_3dfunc
 from devito.tools import as_tuple
 
 import argparse

diff --git a/xdsl-examples/single_thread.sh → xdsl_examples/single_thread.sh b/xdsl-examples/single_thread.sh → xdsl_examples/single_thread.sh
diff --git a/xdsl-examples/slurm-jobs/diffusion-1.slurm → xdsl_examples/slurm-jobs/diffusion-1.slurm b/xdsl-examples/slurm-jobs/diffusion-1.slurm → xdsl_examples/slurm-jobs/diffusion-1.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-128.slurm → xdsl_examples/slurm-jobs/diffusion-128.slurm b/xdsl-examples/slurm-jobs/diffusion-128.slurm → xdsl_examples/slurm-jobs/diffusion-128.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-16.slurm → xdsl_examples/slurm-jobs/diffusion-16.slurm b/xdsl-examples/slurm-jobs/diffusion-16.slurm → xdsl_examples/slurm-jobs/diffusion-16.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-2.slurm → xdsl_examples/slurm-jobs/diffusion-2.slurm b/xdsl-examples/slurm-jobs/diffusion-2.slurm → xdsl_examples/slurm-jobs/diffusion-2.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-32.slurm → xdsl_examples/slurm-jobs/diffusion-32.slurm b/xdsl-examples/slurm-jobs/diffusion-32.slurm → xdsl_examples/slurm-jobs/diffusion-32.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-4.slurm → xdsl_examples/slurm-jobs/diffusion-4.slurm b/xdsl-examples/slurm-jobs/diffusion-4.slurm → xdsl_examples/slurm-jobs/diffusion-4.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-64.slurm → xdsl_examples/slurm-jobs/diffusion-64.slurm b/xdsl-examples/slurm-jobs/diffusion-64.slurm → xdsl_examples/slurm-jobs/diffusion-64.slurm
diff --git a/xdsl-examples/slurm-jobs/diffusion-8.slurm → xdsl_examples/slurm-jobs/diffusion-8.slurm b/xdsl-examples/slurm-jobs/diffusion-8.slurm → xdsl_examples/slurm-jobs/diffusion-8.slurm
diff --git a/xdsl-examples/slurm-jobs/gpu.slurm → xdsl_examples/slurm-jobs/gpu.slurm b/xdsl-examples/slurm-jobs/gpu.slurm → xdsl_examples/slurm-jobs/gpu.slurm
diff --git a/...les/slurm-jobs/job-devito-xdsl-wave.slurm → ...les/slurm-jobs/job-devito-xdsl-wave.slurm b/...les/slurm-jobs/job-devito-xdsl-wave.slurm → ...les/slurm-jobs/job-devito-xdsl-wave.slurm
diff --git a/...examples/slurm-jobs/job-devito-xdsl.slurm → ...examples/slurm-jobs/job-devito-xdsl.slurm b/...examples/slurm-jobs/job-devito-xdsl.slurm → ...examples/slurm-jobs/job-devito-xdsl.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-1.slurm → xdsl_examples/slurm-jobs/openmp-1.slurm b/xdsl-examples/slurm-jobs/openmp-1.slurm → xdsl_examples/slurm-jobs/openmp-1.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-128.slurm → xdsl_examples/slurm-jobs/openmp-128.slurm b/xdsl-examples/slurm-jobs/openmp-128.slurm → xdsl_examples/slurm-jobs/openmp-128.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-16.slurm → xdsl_examples/slurm-jobs/openmp-16.slurm b/xdsl-examples/slurm-jobs/openmp-16.slurm → xdsl_examples/slurm-jobs/openmp-16.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-2.slurm → xdsl_examples/slurm-jobs/openmp-2.slurm b/xdsl-examples/slurm-jobs/openmp-2.slurm → xdsl_examples/slurm-jobs/openmp-2.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-32.slurm → xdsl_examples/slurm-jobs/openmp-32.slurm b/xdsl-examples/slurm-jobs/openmp-32.slurm → xdsl_examples/slurm-jobs/openmp-32.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-4.slurm → xdsl_examples/slurm-jobs/openmp-4.slurm b/xdsl-examples/slurm-jobs/openmp-4.slurm → xdsl_examples/slurm-jobs/openmp-4.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-64.slurm → xdsl_examples/slurm-jobs/openmp-64.slurm b/xdsl-examples/slurm-jobs/openmp-64.slurm → xdsl_examples/slurm-jobs/openmp-64.slurm
diff --git a/xdsl-examples/slurm-jobs/openmp-8.slurm → xdsl_examples/slurm-jobs/openmp-8.slurm b/xdsl-examples/slurm-jobs/openmp-8.slurm → xdsl_examples/slurm-jobs/openmp-8.slurm
diff --git a/xdsl-examples/slurm-jobs/single-node.slurm → xdsl_examples/slurm-jobs/single-node.slurm b/xdsl-examples/slurm-jobs/single-node.slurm → xdsl_examples/slurm-jobs/single-node.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-1.slurm → xdsl_examples/slurm-jobs/wave-1.slurm b/xdsl-examples/slurm-jobs/wave-1.slurm → xdsl_examples/slurm-jobs/wave-1.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-128.slurm → xdsl_examples/slurm-jobs/wave-128.slurm b/xdsl-examples/slurm-jobs/wave-128.slurm → xdsl_examples/slurm-jobs/wave-128.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-16.slurm → xdsl_examples/slurm-jobs/wave-16.slurm b/xdsl-examples/slurm-jobs/wave-16.slurm → xdsl_examples/slurm-jobs/wave-16.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-2.slurm → xdsl_examples/slurm-jobs/wave-2.slurm b/xdsl-examples/slurm-jobs/wave-2.slurm → xdsl_examples/slurm-jobs/wave-2.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-32.slurm → xdsl_examples/slurm-jobs/wave-32.slurm b/xdsl-examples/slurm-jobs/wave-32.slurm → xdsl_examples/slurm-jobs/wave-32.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-4.slurm → xdsl_examples/slurm-jobs/wave-4.slurm b/xdsl-examples/slurm-jobs/wave-4.slurm → xdsl_examples/slurm-jobs/wave-4.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-64.slurm → xdsl_examples/slurm-jobs/wave-64.slurm b/xdsl-examples/slurm-jobs/wave-64.slurm → xdsl_examples/slurm-jobs/wave-64.slurm
diff --git a/xdsl-examples/slurm-jobs/wave-8.slurm → xdsl_examples/slurm-jobs/wave-8.slurm b/xdsl-examples/slurm-jobs/wave-8.slurm → xdsl_examples/slurm-jobs/wave-8.slurm
diff --git a/xdsl_examples/tau00.pdf b/xdsl_examples/tau00.pdf
diff --git a/xdsl_examples/tau01.pdf b/xdsl_examples/tau01.pdf
diff --git a/xdsl_examples/tau11.pdf b/xdsl_examples/tau11.pdf
diff --git a/xdsl_examples/v0.pdf b/xdsl_examples/v0.pdf
diff --git a/xdsl_examples/v1.pdf b/xdsl_examples/v1.pdf
diff --git a/xdsl-examples/wave2d_b.py → xdsl_examples/wave2d_b.py b/xdsl-examples/wave2d_b.py → xdsl_examples/wave2d_b.py
@@ -7,7 +7,7 @@
 from devito.tools import as_tuple
 
 import argparse
-from fast.bench_utils import plot_2dfunc
+from xdsl_examples.bench_utils import plot_2dfunc
 
 np.set_printoptions(threshold=np.inf)
 

diff --git a/xdsl-examples/wave3d_b.py → xdsl_examples/wave3d_b.py b/xdsl-examples/wave3d_b.py → xdsl_examples/wave3d_b.py
@@ -7,7 +7,8 @@
 from devito.tools import as_tuple
 
 import argparse
-from fast.bench_utils import plot_3dfunc
+from xdsl_examples.bench_utils import plot_3dfunc
+
 
 np.set_printoptions(threshold=np.inf)
 

diff --git a/xdsl-examples/wave_eq_3d.py → xdsl_examples/wave_eq_3d.py b/xdsl-examples/wave_eq_3d.py → xdsl_examples/wave_eq_3d.py