From 94eb372b6dd81178f95635e1a9c847e7d16a8fe1 Mon Sep 17 00:00:00 2001 From: "Claudius \"keldu\" Holeksa" Date: Thu, 11 Sep 2025 16:02:16 +0200 Subject: Yesterdays dangling things --- examples/cavity_2d_gpu/.nix/derivation.nix | 6 ------ examples/cavity_2d_gpu/SConstruct | 6 ++++-- examples/cavity_2d_gpu/cavity_2d_gpu.cpp | 12 +++++++++--- 3 files changed, 13 insertions(+), 11 deletions(-) (limited to 'examples/cavity_2d_gpu') diff --git a/examples/cavity_2d_gpu/.nix/derivation.nix b/examples/cavity_2d_gpu/.nix/derivation.nix index 876bcb7..f8d7314 100644 --- a/examples/cavity_2d_gpu/.nix/derivation.nix +++ b/examples/cavity_2d_gpu/.nix/derivation.nix @@ -29,12 +29,6 @@ stdenv.mkDerivation { kel-lbm ]; - doCheck = true; - checkPhase = '' - scons test - ./bin/tests - ''; - preferLocalBuild = true; outputs = [ "out" "dev" ]; diff --git a/examples/cavity_2d_gpu/SConstruct b/examples/cavity_2d_gpu/SConstruct index fc60882..da59a2d 100644 --- a/examples/cavity_2d_gpu/SConstruct +++ b/examples/cavity_2d_gpu/SConstruct @@ -54,11 +54,13 @@ env=Environment(ENV=os.environ, variables=env_vars, CPPPATH=[], '-std=c++20', '-g', '-Wall', - '-Wextra' + '-Wextra', + '-isystem', 'AdaptiveCpp' ], LIBS=[ 'forstio-core', - 'forstio-codec' + 'forstio-codec', + 'acpp-rt' ] ); env.__class__.add_source_files = add_kel_source_files diff --git a/examples/cavity_2d_gpu/cavity_2d_gpu.cpp b/examples/cavity_2d_gpu/cavity_2d_gpu.cpp index dc022a1..edb7dd8 100644 --- a/examples/cavity_2d_gpu/cavity_2d_gpu.cpp +++ b/examples/cavity_2d_gpu/cavity_2d_gpu.cpp @@ -3,6 +3,8 @@ #include // #include + #include #include #include @@ -111,6 +113,7 @@ constexpr size_t dim_y = 128; void set_geometry(saw::data& latt){ using namespace kel::lbm; + auto meta = latt.meta(); /** * Set ghost */ @@ -183,8 +186,9 @@ void set_initial_conditions(saw::data& latt){ void lbm_step( saw::data& latt, + bool even_step, uint64_t time_step, - sycl::queue& sycl_q + acpp::sycl::queue& sycl_q ){ using namespace kel::lbm; using dfi = df_info; @@ -283,7 +287,8 @@ int main(){ */ set_initial_conditions(lattice); - sycl::queue sycl_q{sycl::default_selector_v, sycl::property::queue::in_order{}}; + acpp::sycl::queue sycl_q{acpp::sycl::default_selector_v, acpp::sycl::property::queue::in_order{}}; + acpp::sycl::buffer> df_sycl{&lattice, 1u}; /** * Timeloop @@ -297,6 +302,7 @@ int main(){ saw::data,sch::D2Q9::D>> macros{dim}; + for(uint64_t i = 0u; i < 256u; ++i){ { std::string vtk_f_name{"tmp/poiseulle_2d_"}; @@ -304,7 +310,7 @@ int main(){ write_vtk_file(vtk_f_name, macros); } - lbm_step(lattice, i, sycl_q); + lbm_step(lattice, (i%2u == 0u), i, sycl_q); } return 0; } -- cgit v1.2.3