update submod

LuisaGroup · Sep 19, 2023 · c3d317e · c3d317e
1 parent 157c2f3
commit c3d317e
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 6 deletions.
diff --git a/luisa_compute/Cargo.toml b/luisa_compute/Cargo.toml
@@ -43,3 +43,5 @@ dx = ["luisa_compute_sys/dx"]
 strict = ["luisa_compute_sys/strict"]
 remote = ["luisa_compute_sys/remote"]
 cpu = ["luisa_compute_sys/cpu"]
+
+
diff --git a/luisa_compute/examples/autodiff.rs b/luisa_compute/examples/autodiff.rs
@@ -33,13 +33,13 @@ fn main() {
         let buf_y = y.var();
         let x = buf_x.read(tid);
         let y = buf_y.read(tid);
-        let f = track!(|x: Expr<f32>, y: Expr<f32>| {
-            if x > y {
+        let f = |x: Expr<f32>, y: Expr<f32>| {
+            track!(if x > y {
                 x * y
             } else {
                 y * x + (x / 32.0 * PI).sin()
-            }
-        });
+            })
+        };
         autodiff(|| {
             requires_grad(x);
             requires_grad(y);

diff --git a/luisa_compute/src/lang.rs b/luisa_compute/src/lang.rs
@@ -34,6 +34,7 @@ pub mod ops;
 pub mod poly;
 pub mod swizzle;
 pub mod types;
+pub mod soa;
 
 #[allow(dead_code)]
 pub(crate) static KERNEL_ID: AtomicUsize = AtomicUsize::new(0);

diff --git a/luisa_compute/src/lang/soa.rs b/luisa_compute/src/lang/soa.rs
@@ -0,0 +1,9 @@
+use luisa_compute_ir::{ir::Type, CArc};
+
+use crate::prelude::*;
+/** A buffer with SOA layout.
+ */
+pub struct SoaBuffer<T: Value> {
+    inner: ByteBuffer,
+    _marker: std::marker::PhantomData<T>,
+}
diff --git a/luisa_compute/src/runtime.rs b/luisa_compute/src/runtime.rs
@@ -16,6 +16,7 @@ use raw_window_handle::HasRawWindowHandle;
 use winit::window::Window;
 
 use crate::internal_prelude::*;
+use crate::lang::soa::SoaBuffer;
 use ir::{
     CallableModule, CallableModuleRef, Capture, CpuCustomOp, KernelModule, Module, ModuleFlags,
     ModuleKind, ModulePools,
@@ -180,6 +181,10 @@ impl Device {
         };
         buffer
     }
+    pub fn create_soa_buffer<T: Value>(&self, count: usize) -> SoaBuffer<T> {
+        // let inner = self.create_byte_buffer(len)
+        todo!()
+    }
     pub fn create_buffer<T: Value>(&self, count: usize) -> Buffer<T> {
         assert!(
             std::mem::size_of::<T>() > 0,

diff --git a/luisa_compute_derive_impl/src/lib.rs b/luisa_compute_derive_impl/src/lib.rs
@@ -109,6 +109,7 @@ impl Compiler {
             }
         )
     }
+
     pub fn derive_value(&self, struct_: &ItemStruct) -> TokenStream {
         self.check_repr_c(&struct_.attrs);
         let span = struct_.span();

diff --git a/luisa_compute_sys/LuisaCompute b/luisa_compute_sys/LuisaCompute
diff --git a/luisa_compute_track/src/lib.rs b/luisa_compute_track/src/lib.rs
@@ -171,7 +171,9 @@ impl VisitMut for TraceVisitor {
 
 #[proc_macro]
 pub fn track(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    track_impl(parse_macro_input!(input as Expr)).into()
+    let input: TokenStream = input.into();
+    let block_input: proc_macro::TokenStream = quote!({ #input }).into();
+    track_impl(parse_macro_input!(block_input as Expr)).into()
 }
 
 fn track_impl(mut ast: Expr) -> TokenStream {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,3 +43,5 @@ dx = ["luisa_compute_sys/dx"]
		strict = ["luisa_compute_sys/strict"]
		remote = ["luisa_compute_sys/remote"]
		cpu = ["luisa_compute_sys/cpu"]
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,6 +109,7 @@ impl Compiler { @@
                 }
             )
         }
         pub fn derive_value(&self, struct_: &ItemStruct) -> TokenStream {
             self.check_repr_c(&struct_.attrs);
             let span = struct_.span();
@@ Expand Down @@
+0 −1		include/luisa/ast/type.h
+0 −6		include/luisa/ast/type_registry.h
+60 −8		include/luisa/core/basic_traits.h
+4 −4		include/luisa/core/concepts.h
+77 −72		include/luisa/dsl/builtin.h
+49 −23		include/luisa/dsl/expr_traits.h
+6 −6		include/luisa/dsl/operators.h
+1 −0		include/luisa/ir/fwd.h
+80 −0		include/luisa/ir/ir.h
+14 −12		src/api/runtime.cpp
+5 −0		src/backends/common/hlsl/builtin/hlsl_header
+2 −2		src/backends/common/hlsl/builtin/hlsl_header.c
+1 −0		src/backends/common/hlsl/hlsl_codegen_util.cpp
+6 −12		src/backends/common/rust_device_common.cpp
+13 −8		src/backends/dx/Resource/BindlessArray.cpp
+1 −1		src/backends/validation/rw_resource.cpp
+9 −0		src/backends/validation/rw_resource.h
+1 −1		src/ext/corrosion
+1 −1		src/ext/magic_enum
+11 −0		src/ir/ir.cpp
+1 −0		src/py/luisa/array.py
+1 −0		src/py/luisa/struct.py
+23 −23		src/rust/Cargo.lock
+60 −25		src/rust/cppbindgen/src/main.rs
+21 −61		src/rust/luisa_compute_backend_impl/src/cpu/codegen/cpp.rs