Skip to content

Move to C++17 and fix Status call #99

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Move to C++17 and fix Status call #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
10b0a7f
Switch to C++17 instead of C++11 which is incompatible with tensorflow.
Keeper-of-the-Keys Jun 18, 2025
01e67a8
Fix status api call, Status::OK() was replaced with Status()
Keeper-of-the-Keys Jun 18, 2025
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
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if(DIFFVG_CUDA)
set(CMAKE_CUDA_STANDARD 11)
if(NOT WIN32)
# Hack: for some reason the line above doesn't work on some Linux systems.
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -std=c++11")
set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} -std=c++17")
#set(CUDA_NVCC_FLAGS_DEBUG "-g -G")
endif()
else()
Expand Down Expand Up @@ -118,7 +118,7 @@ elseif(APPLE)
set_target_properties(diffvg PROPERTIES INSTALL_RPATH "@loader_path")
endif()

set_property(TARGET diffvg PROPERTY CXX_STANDARD 11)
set_property(TARGET diffvg PROPERTY CXX_STANDARD 17)
set_target_properties(diffvg PROPERTIES PREFIX "")
# Still enable assertion in release mode
string( REPLACE "/DNDEBUG" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
Expand Down
2 changes: 1 addition & 1 deletion pydiffvg_tensorflow/custom_ops/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.12)

set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

project(diffvgTFCustomOp)
Expand Down
2 changes: 1 addition & 1 deletion pydiffvg_tensorflow/custom_ops/data_ptr.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ REGISTER_OP("DataPtr")
.Output("output: uint64") // scalar
.SetShapeFn([](::tensorflow::shape_inference::InferenceContext* c) {
c->set_output(0, {}); // scalar
return Status::OK();
return Status();
});

template <typename T>
Expand Down