Merge branch 'main' into static_helpers

Author: austinvhuang

examples/gpu_puzzles/key.cpp

@@ -54,7 +54,7 @@ void puzzle1(Context &ctx) {
   Tensor a = createTensor(ctx, {N}, kf32, makeData<N>().data());
   Tensor output = createTensor(ctx, {N}, kf32);
   Kernel op = createKernel(ctx, {kPuzzle1, N}, Bindings{a, output},
-                           /*nWorkgroups */ {1, 1, 1});
+                           /*totalWorkgroups */ {1, 1, 1});
   showResult<N>(ctx, op, output);
 }
 
@@ -146,7 +146,7 @@ void puzzle4(Context &ctx) {
   };
   Kernel op =
       createKernel(ctx, {kPuzzle4, /*workgroup size*/ {Wx, Wy, 1}},
-                   Bindings{input, output}, /* nWorkgroups */ {1, 1, 1}, Params{N});
+                   Bindings{input, output}, /* totalWorkgroups */ {1, 1, 1}, Params{N});
   showResult<N, N, N>(ctx, op, output);
 }
 

examples/hello_world/Makefile

@@ -22,6 +22,9 @@ run_setup: check-python
 build/$(TARGET): run.cpp
 	mkdir -p build && $(CXX) $(FLAGS) -DNDEBUG -o ./build/$(TARGET)
 
+debug: run.cpp
+	mkdir -p build && $(CXX) $(FLAGS) -g -o ./build/$(TARGET)
+
 clean:
 	read -r -p "This will delete the contents of build/*. Are you sure? [CTRL-C to abort] " response && rm -rf build/*
 

experimental/fasthtml/gpu_puzzles/Makefile

@@ -24,9 +24,13 @@ build/run.wasm: check-emsdk run.cpp
 	em++ run.cpp -o build/run.wasm \
 		$(COMMON_FLAGS) $(WASM_FLAGS)
 
-watch:
+watch-rel:
 	@echo "Watching for changes..."
-	ls run.cpp | entr -c make debug
+	ls *.cpp *.h | entr -c make build/run.js
+
+watch-dbg:
+	@echo "Watching for changes..."
+	ls *.cpp *.h | entr -c make debug
 
 server: build/run.js
 	python3 run.py