Merge pull request #55 from JustCallMeRay/main

austinvhuang · web-flow · commit 634ab745e4a4 · 2024-09-14T00:22:06.000-04:00
Changes file extension of public facing files from .h to .hpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,7 +42,7 @@ message(
         "Include directories for wgpu: ${CMAKE_CURRENT_SOURCE_DIR}/third_party/headers"
 )
 
-add_library(gpud SHARED gpu.h)
+add_library(gpud SHARED gpu.hpp)
 set_target_properties(gpud PROPERTIES LINKER_LANGUAGE CXX)
 target_link_libraries(gpud PRIVATE wgpu)
 target_link_libraries(gpud PRIVATE webgpu)
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ endif
 default: examples/hello_world/build/hello_world
 
 pch:
-	mkdir -p build && $(CXX) -std=c++17 $(INCLUDES) -x c++-header gpu.h -o build/gpu.h.pch
+	mkdir -p build && $(CXX) -std=c++17 $(INCLUDES) -x c++-header gpu.hpp -o build/gpu.hpp.pch
 
 # TODO(avh): change extension based on platform
 lib:
@@ -85,7 +85,7 @@ clean:
 	rm -rf examples/render/build/*
 	rm -rf examples/shadertui/build/*
 	rm -rf examples/transpose/build/transpose
-	rm -f build/gpu.h.pch
+	rm -f build/gpu.hpp.pch
 	rm -f build/libgpucpp.so
 	rm -f build/half
 
diff --git a/README.md b/README.md
@@ -98,7 +98,7 @@ Here's a GELU kernel implemented (based on the CUDA implementation in [llm.c](ht
 #include <cstdio>
 #include <future>
 
-#include "gpu.h"
+#include "gpu.hpp"
 
 using namespace gpu; // createContext, createTensor, createKernel,
                      // dispatchKernel, wait, toCPU Bindings,
diff --git a/cmake/find_gpu.cmake b/cmake/find_gpu.cmake
@@ -1,5 +1,5 @@
 # file name to find
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 # Function to check for file existence up the directory hierarchy
 function(find_project_root current_dir filename result_var)
diff --git a/cmake/webgpu.cmake b/cmake/webgpu.cmake
@@ -1,5 +1,5 @@
 # Specify the filename to search for
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/float16/CMakeLists.txt b/examples/float16/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(float16)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/float16/run.cpp b/examples/float16/run.cpp
@@ -2,8 +2,8 @@
 #include <cstdio>
 #include <future>
 
-#include "gpu.h"
-#include "numeric_types/half.h"
+#include "gpu.hpp"
+#include "numeric_types/half.hpp"
 
 using namespace gpu; // createContext, createTensor, createKernel,
                      // createShader, dispatchKernel, wait, toCPU
diff --git a/examples/gpu_puzzles/CMakeLists.txt b/examples/gpu_puzzles/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(gpu_puzzles)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/gpu_puzzles/key.cpp b/examples/gpu_puzzles/key.cpp
@@ -3,8 +3,8 @@
  * https://github.com/srush/GPU-Puzzles
  */
 
-#include "gpu.h"
-#include "utils/array_utils.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
 #include <array>
 #include <cstdio>
 #include <future>
diff --git a/examples/gpu_puzzles/run.cpp b/examples/gpu_puzzles/run.cpp
@@ -3,8 +3,8 @@
  * https://github.com/srush/GPU-Puzzles
  */
 
-#include "gpu.h"
-#include "utils/array_utils.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
 #include <array>
 #include <cstdio>
 #include <future>
diff --git a/examples/hello_world/CMakeLists.txt b/examples/hello_world/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(hello_world)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/hello_world/run.cpp b/examples/hello_world/run.cpp
@@ -1,4 +1,4 @@
-#include "gpu.h"
+#include "gpu.hpp"
 #include <array>
 #include <cstdio>
 #include <future>
diff --git a/examples/matmul/CMakeLists.txt b/examples/matmul/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(matmul)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/matmul/run.cpp b/examples/matmul/run.cpp
@@ -4,14 +4,14 @@
 #include <random>
 #include <cstdlib>
 
-#include "gpu.h" // createContext, createTensor, createKernel, dispatchKernel,
-                 // wait, resetCommandBuffer, toCPU
-
-#include "llmc/reference_impls.h" // for CPU reference implementation
-#include "utils/array_utils.h"    // show, isclose, randn, randint
-#include "utils/logging.h"        // LOG
-#include "experimental/wgsl.h"    // loopUnrolling
-#include "numeric_types/half.h"
+#include "gpu.hpp" // createContext, createTensor, createKernel, dispatchKernel,
+                   // wait, resetCommandBuffer, toCPU
+
+#include "llmc/reference_impls.h"   // for CPU reference implementation
+#include "utils/array_utils.hpp"    // show, isclose, randn, randint
+#include "utils/logging.hpp"        // LOG
+#include "experimental/wgsl.h"      // loopUnrolling
+#include "numeric_types/half.hpp"
 
 using namespace gpu;
 
diff --git a/examples/physics/CMakeLists.txt b/examples/physics/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(physics)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/physics/run.cpp b/examples/physics/run.cpp
@@ -5,7 +5,7 @@
 #include <thread>
 
 #include "experimental/tui.h" // rasterize
-#include "gpu.h"
+#include "gpu.hpp"
 
 using namespace gpu;
 
diff --git a/examples/render/CMakeLists.txt b/examples/render/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(render)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/render/run.cpp b/examples/render/run.cpp
@@ -3,9 +3,9 @@
 #include <cstdio>
 #include <future>
 
-#include "gpu.h"
-#include "utils/array_utils.h"
-#include "utils/logging.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
+#include "utils/logging.hpp"
 
 using namespace gpu;
 
diff --git a/examples/shadertui/CMakeLists.txt b/examples/shadertui/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.28)
 project(shadertui)
 
-set(FILENAME "gpu.h")
+set(FILENAME "gpu.hpp")
 
 get_filename_component(PROJECT_ROOT ${CMAKE_CURRENT_SOURCE_DIR} DIRECTORY)
 get_filename_component(PROJECT_ROOT ${PROJECT_ROOT} DIRECTORY)
diff --git a/examples/shadertui/run.cpp b/examples/shadertui/run.cpp
@@ -1,4 +1,3 @@
-#include "gpu.h"
 #include <array>
 #include <cstdio>
 #include <fstream>
@@ -7,8 +6,9 @@
 #include <string>
 #include <thread>
 
-#include "utils/array_utils.h"
-#include "utils/logging.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
+#include "utils/logging.hpp"
 
 using namespace gpu;
 
diff --git a/examples/transpose/run.cpp b/examples/transpose/run.cpp
@@ -4,13 +4,13 @@
 #include <random>
 #include <cstdlib>
 
-#include "gpu.h" // createContext, createTensor, createKernel, dispatchKernel,
-                 // wait, resetCommandBuffer, toCPU
+#include "gpu.hpp" // createContext, createTensor, createKernel, dispatchKernel,
+                   // wait, resetCommandBuffer, toCPU
 
-#include "llmc/reference_impls.h" // for CPU reference implementation
-#include "utils/array_utils.h"    // show, isclose, randn, randint
-#include "utils/logging.h"        // LOG
-#include "experimental/wgsl.h"    // loopUnrolling
+#include "llmc/reference_impls.h"   // for CPU reference implementation
+#include "utils/array_utils.hpp"    // show, isclose, randn, randint
+#include "utils/logging.hpp"        // LOG
+#include "experimental/wgsl.h"      // loopUnrolling
 
 using namespace gpu;
 
diff --git a/examples/web/run.cpp b/examples/web/run.cpp
@@ -2,8 +2,8 @@
 #include <cstdio>
 #include <future>
 #include <memory>
-#include "gpu.h"
 
+#include "gpu.hpp"
 #include "emscripten/emscripten.h"
 
 using namespace gpu; // createContext, createTensor, createKernel,
diff --git a/examples/webgpu_from_scratch/run.cpp b/examples/webgpu_from_scratch/run.cpp
@@ -1,8 +1,8 @@
-#include "spdlog/spdlog.h"
-#include "webgpu/webgpu.h"
 #include <array>
 #include <future>
 
+#include "webgpu/webgpu.h"
+#include "spdlog/spdlog.h"
 /*
  * Approximate GELU kernel definition, implemented as a WGSL.
  * In general GPU device code for WEBGPU is written in the WGSL domain specific
@@ -50,7 +50,7 @@ inline void check(bool condition, const char *message,
 
 /*
  * Convenience function to display the first few elements of an array. A more
- * robust/extensive version of this is in array_utils.h this is minimal to keep
+ * robust/extensive version of this is in array_utils.hpp this is minimal to keep
  * this example self-contained.
  *
  * @param a: The array to show.
diff --git a/experimental/fasthtml/shadertui_web.cpp b/experimental/fasthtml/shadertui_web.cpp
@@ -1,4 +1,3 @@
-#include "gpu.h"
 #include <array>
 #include <cstdio>
 #include <emscripten/emscripten.h>
@@ -7,6 +6,7 @@
 #include <string>
 #include <algorithm>
 
+#include "gpu.hpp"
 using namespace gpu;
 
 static constexpr size_t kRows = 64;
diff --git a/experimental/kernels/kernels.h b/experimental/kernels/kernels.h
@@ -1,7 +1,7 @@
 #ifndef KERNELS_H
 #define KERNELS_H
 
-#include "gpu.h"
+#include "gpu.hpp"
 
 namespace gpu {
 
diff --git a/experimental/kernels/run.cpp b/experimental/kernels/run.cpp
@@ -3,9 +3,9 @@
 #include <memory>
 #include <random>
 
-#include "gpu.h"
-#include "utils/array_utils.h"
-#include "utils/logging.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
+#include "utils/logging.hpp"
 
 #include "llmc/reference_impls.h"
 #include "kernels.h"
diff --git a/experimental/legacy/audio/run.cpp b/experimental/legacy/audio/run.cpp
@@ -2,7 +2,7 @@
 #include <cmath>
 #include <cstdio>
 
-#include "gpu.h"
+#include "gpu.hpp"
 #include "portaudio.h"
 
 #define SAMPLE_RATE (44100)
diff --git a/experimental/legacy/fasthtml_test/run.cpp b/experimental/legacy/fasthtml_test/run.cpp
@@ -1,11 +1,12 @@
-#include "gpu.h"
 #include <array>
 #include <cstdio>
 #include <emscripten/emscripten.h>
 #include <future>
 #include <memory>
 #include <string>
 
+#include "gpu.hpp"
+
 using namespace gpu;
 
 EM_JS(void, js_print, (const char *str), {
diff --git a/experimental/legacy/transformer/run.cpp b/experimental/legacy/transformer/run.cpp
@@ -1,6 +1,6 @@
-#include "gpu.h"
-#include "utils/array_utils.h"
-#include "utils/logging.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
+#include "utils/logging.hpp"
 #include <array>
 
 #include "llmc/reference_impls.h"
diff --git a/experimental/legacy/transformer/shaders.h b/experimental/legacy/transformer/shaders.h
@@ -1,7 +1,7 @@
 #ifndef KERNELS_H
 #define KERNELS_H
 
-#include "gpu.h"
+#include "gpu.hpp"
 
 namespace gpu {
 
diff --git a/experimental/legacy/transformer/test_kernels.cpp b/experimental/legacy/transformer/test_kernels.cpp
@@ -3,9 +3,9 @@
 #include <memory>
 #include <random>
 
-#include "gpu.h"
-#include "utils/array_utils.h"
-#include "utils/logging.h"
+#include "gpu.hpp"
+#include "utils/array_utils.hpp"
+#include "utils/logging.hpp"
 
 #include "llmc/reference_impls.h"
 #include "shaders.h"
diff --git a/experimental/wgsl.h b/experimental/wgsl.h
@@ -3,7 +3,7 @@
 
 #include <string>
 #include <regex>
-#include "utils/logging.h"        // LOG
+#include "utils/logging.hpp"        // LOG
 
 namespace gpu {
 
diff --git a/gpu.cpp b/gpu.cpp
@@ -1 +1 @@
-#include "gpu.h"
+#include "gpu.hpp"
diff --git a/gpu.hpp b/gpu.hpp
@@ -1,5 +1,5 @@
-#ifndef GPU_H
-#define GPU_H
+#ifndef GPU_HPP
+#define GPU_HPP
 
 #include <array>
 #include <cassert>
@@ -17,8 +17,8 @@
 
 #include "webgpu/webgpu.h"
 
-#include "numeric_types/half.h"
-#include "utils/logging.h"
+#include "numeric_types/half.hpp"
+#include "utils/logging.hpp"
 
 #ifdef __EMSCRIPTEN__
 #include "emscripten/emscripten.h"
diff --git a/numeric_types/half.cpp b/numeric_types/half.cpp
@@ -5,8 +5,8 @@
 #include <cstdint>
 #include <cstdio>
 
-#include "gpu.h"
-#include "numeric_types/half.h"
+#include "gpu.hpp"
+#include "numeric_types/half.hpp"
 
 using namespace gpu;
 using std::isinf;
diff --git a/numeric_types/half.hpp b/numeric_types/half.hpp
diff --git a/utils/array_utils.hpp b/utils/array_utils.hpp
diff --git a/utils/logging.hpp b/utils/logging.hpp

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ message(`
`42`	`42`	`"Include directories for wgpu: ${CMAKE_CURRENT_SOURCE_DIR}/third_party/headers"`
`43`	`43`	`)`
`44`	`44`
`45`		`-add_library(gpud SHARED gpu.h)`
	`45`	`+add_library(gpud SHARED gpu.hpp)`
`46`	`46`	`set_target_properties(gpud PROPERTIES LINKER_LANGUAGE CXX)`
`47`	`47`	`target_link_libraries(gpud PRIVATE wgpu)`
`48`	`48`	`target_link_libraries(gpud PRIVATE webgpu)`