Skip to content

m1 mac - DRAFT PR with claude code - untested - do not merge #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mly-johndpope wants to merge 1 commit into
base: main
Choose a base branch
from
Open

m1 mac - DRAFT PR with claude code - untested - do not merge #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .claude/settings.local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"permissions": {
"allow": [
"Bash(python:*)",
"Bash(pip install:*)",
"Bash(mv:*)",
"Bash(git clone:*)"
],
"deny": []
}
}
107 changes: 91 additions & 16 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,26 +22,101 @@

cmake_minimum_required(VERSION 3.20)

project(DiffRast LANGUAGES CUDA CXX)
# Detect platform and available languages
if(APPLE)
project(DiffRast LANGUAGES CXX OBJCXX)
set(USE_CUDA OFF)
set(USE_METAL ON)
else()
find_package(CUDA QUIET)
if(CUDA_FOUND)
project(DiffRast LANGUAGES CUDA CXX)
set(USE_CUDA ON)
set(USE_METAL OFF)
else()
project(DiffRast LANGUAGES CXX)
set(USE_CUDA OFF)
set(USE_METAL OFF)
endif()
endif()

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CUDA_STANDARD 17)

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
if(USE_CUDA)
set(CMAKE_CUDA_STANDARD 17)
endif()

add_library(CudaRasterizer
cuda_rasterizer/backward.h
cuda_rasterizer/backward.cu
cuda_rasterizer/forward.h
cuda_rasterizer/forward.cu
cuda_rasterizer/auxiliary.h
cuda_rasterizer/rasterizer_impl.cu
cuda_rasterizer/rasterizer_impl.h
cuda_rasterizer/rasterizer.h
)
# Find OpenMP for CPU fallback
find_package(OpenMP)
if(OpenMP_CXX_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
endif()

set_target_properties(CudaRasterizer PROPERTIES CUDA_ARCHITECTURES "70;75;86")
# Build appropriate backend
if(USE_CUDA)
# CUDA backend (original)
add_library(CudaRasterizer
cuda_rasterizer/backward.h
cuda_rasterizer/backward.cu
cuda_rasterizer/forward.h
cuda_rasterizer/forward.cu
cuda_rasterizer/auxiliary.h
cuda_rasterizer/rasterizer_impl.cu
cuda_rasterizer/rasterizer_impl.h
cuda_rasterizer/rasterizer.h
)

set_target_properties(CudaRasterizer PROPERTIES CUDA_ARCHITECTURES "70;75;86")
target_include_directories(CudaRasterizer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/cuda_rasterizer)
target_include_directories(CudaRasterizer PRIVATE third_party/glm ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})

set(RASTERIZER_LIB CudaRasterizer)

elseif(USE_METAL AND APPLE)
# Metal backend for Apple Silicon
add_library(MetalRasterizer
metal_rasterizer/rasterizer_metal.h
metal_rasterizer/rasterizer_metal.mm
)

find_library(METAL_FRAMEWORK Metal)
find_library(METALKIT_FRAMEWORK MetalKit)
find_library(MPS_FRAMEWORK MetalPerformanceShaders)
find_library(FOUNDATION_FRAMEWORK Foundation)

target_link_libraries(MetalRasterizer
${METAL_FRAMEWORK}
${METALKIT_FRAMEWORK}
${MPS_FRAMEWORK}
${FOUNDATION_FRAMEWORK}
)

target_include_directories(MetalRasterizer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/metal_rasterizer)
target_include_directories(MetalRasterizer PRIVATE third_party/glm)
target_compile_definitions(MetalRasterizer PRIVATE USE_METAL=1)

set(RASTERIZER_LIB MetalRasterizer)

else()
# CPU fallback
add_library(CPURasterizer
cpu_rasterizer/rasterizer_cpu.h
cpu_rasterizer/rasterizer_cpu.cpp
)

if(OpenMP_CXX_FOUND)
target_link_libraries(CPURasterizer OpenMP::OpenMP_CXX)
target_compile_definitions(CPURasterizer PRIVATE USE_OPENMP=1)
endif()

target_include_directories(CPURasterizer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/cpu_rasterizer)
target_include_directories(CPURasterizer PRIVATE third_party/glm)
target_compile_definitions(CPURasterizer PRIVATE USE_CPU=1)

set(RASTERIZER_LIB CPURasterizer)

endif()

target_include_directories(CudaRasterizer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/cuda_rasterizer)
target_include_directories(CudaRasterizer PRIVATE third_party/glm ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
# Export the selected backend
set(DIFF_RAST_BACKEND ${RASTERIZER_LIB} PARENT_SCOPE)
Loading