diff options
| -rw-r--r-- | default.nix | 3 | ||||
| -rw-r--r-- | examples/poiseulle_3d_gpu/sim.cpp | 3 | ||||
| -rwxr-xr-x | util/podman/norce_build_and_run.sh | 9 |
3 files changed, 12 insertions, 3 deletions
diff --git a/default.nix b/default.nix index 316ea80..9108cf3 100644 --- a/default.nix +++ b/default.nix @@ -68,7 +68,7 @@ let src = builtins.fetchurl { url = "https://git.keldu.de/forstio-forstio/snapshot/master.tar.gz"; - sha256 = "sha256:10dffxzkyvm705l75vypl95dg40b68p5qqfizcx7ppcqyzz1h779"; + sha256 = "sha256:026scvd9015blphbj49d0cv5wfrxh1szzdv3p212wzk4iw643akj"; }; phases = [ "unpackPhase" "installPhase" ]; @@ -185,6 +185,7 @@ in rec { kel.lbm.core kel.lbm.sycl examples.poiseulle_particles_2d_gpu + examples.poiseulle_3d_gpu ]; }; }; diff --git a/examples/poiseulle_3d_gpu/sim.cpp b/examples/poiseulle_3d_gpu/sim.cpp index e145b11..27e5297 100644 --- a/examples/poiseulle_3d_gpu/sim.cpp +++ b/examples/poiseulle_3d_gpu/sim.cpp @@ -255,7 +255,7 @@ saw::error_or<void> lbm_main(int argc, char** argv){ } auto& lbm_dir = eo_lbm_dir.get_value(); - auto out_dir = lbm_dir / "poiseulle_particles_2d_gpu"; + auto out_dir = lbm_dir / "poiseulle_particles_3d_gpu"; { std::error_code ec; @@ -272,7 +272,6 @@ saw::error_or<void> lbm_main(int argc, char** argv){ {{1.0}} }; - // saw::data<sch::FixedArray<sch::UInt64,Desc::D>> meta{{dim_x,dim_y}}; auto lbm_data_ptr = saw::heap<saw::data<sch::ChunkStruct<T,Desc>>>(); auto lbm_macro_data_ptr = saw::heap<saw::data<sch::MacroStruct<T,Desc>>>(); auto lbm_particle_data_ptr = saw::heap<saw::data<sch::FixedArray<sch::Particle<T,Desc::D>, particle_size>>>(); diff --git a/util/podman/norce_build_and_run.sh b/util/podman/norce_build_and_run.sh index 35c6df5..048d2c7 100755 --- a/util/podman/norce_build_and_run.sh +++ b/util/podman/norce_build_and_run.sh @@ -41,9 +41,18 @@ elif [[ -f /etc/pki/tls/certs/ca-bundle.crt ]]; then HOST_CA_BUNDLE="/etc/pki/tls/certs/ca-bundle.crt" fi +TIMESTAMP=$(date +%s) # e.g. 1763452799 +HOST_LBM_BASE="$HOME/.lbm" +HOST_LBM_RUN_DIR="$HOST_LBM_BASE/$TIMESTAMP" + +mkdir -p "$HOST_LBM_RUN_DIR" + +echo "📁 Using host LBM directory: $HOST_LBM_RUN_DIR" + # --- Run build + packaging inside container --- podman run --rm -it \ -v "$GIT_ROOT":/workspace \ + -v "$HOST_LBM_RUN_DIR":/root/.lbm \ -v "$NIX_STORE_VOL":/nix/store \ -v "$NIX_STATE_VOL":/nix/var \ -v /etc/ssl/certs:/etc/ssl/certs:ro \ |