Publish NVTX version 3.3.0 to release-v3 branch

Author: evanramos-nvidia

.github/workflows/test.yml

@@ -353,7 +353,7 @@ jobs:
         cd tests
         mkdir build-vs
         cd build-vs
-        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX
+        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX -Zc:preprocessor
         "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER="%CONDA:\=/%/envs/cuda-env/Library/bin/nvcc.exe" -DCMAKE_C_FLAGS="-O2 %FLAGS%" -DCMAKE_CXX_FLAGS="-O2 %FLAGS%" -DCMAKE_CUDA_FLAGS="%FLAGS% -wd4555 --Wno-deprecated-gpu-targets --Werror all-warnings" && ninja
 
     - name: Run (VS 2022)
@@ -374,7 +374,7 @@ jobs:
         cd tests
         mkdir build-vs-x86
         cd build-vs-x86
-        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX
+        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX -Zc:preprocessor
         "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat" && "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=False -DCMAKE_C_FLAGS="-O2 %FLAGS%" -DCMAKE_CXX_FLAGS="-O2 %FLAGS%" && ninja
 
     - name: Build (VS 2022 Arm64)
@@ -383,7 +383,7 @@ jobs:
         cd tests
         mkdir build-vs-arm64
         cd build-vs-arm64
-        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4746 -wd4820 -wd5039 -wd5045 -wd5220 -WX
+        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4746 -wd4820 -wd5039 -wd5045 -wd5220 -WX -Zc:preprocessor
         "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" && "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=False -DCMAKE_C_FLAGS="-O2 %FLAGS%" -DCMAKE_CXX_FLAGS="-O2 %FLAGS%" && ninja
 
     - name: Build (Clang-CL)
@@ -433,7 +433,7 @@ jobs:
         cd tests
         mkdir build-vs
         cd build-vs
-        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX
+        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX -Zc:preprocessor
         "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat" && "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CUDA_COMPILER="%CONDA:\=/%/envs/cuda-env/Library/bin/nvcc.exe" -DCMAKE_C_FLAGS="-O2 %FLAGS%" -DCMAKE_CXX_FLAGS="-O2 %FLAGS%" -DCMAKE_CUDA_FLAGS="%FLAGS% -wd4555 --Wno-deprecated-gpu-targets --Werror all-warnings" && ninja
 
     - name: Run (VS 2022)
@@ -454,7 +454,7 @@ jobs:
         cd tests
         mkdir build-vs-x86
         cd build-vs-x86
-        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX
+        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4820 -wd5039 -wd5045 -wd5220 -WX -Zc:preprocessor
         "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat" && "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=False -DCMAKE_C_FLAGS="-O2 %FLAGS%" -DCMAKE_CXX_FLAGS="-O2 %FLAGS%" && ninja
 
     - name: Build (VS 2022 Arm64)
@@ -463,7 +463,7 @@ jobs:
         cd tests
         mkdir build-vs-arm64
         cd build-vs-arm64
-        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4746 -wd4820 -wd5039 -wd5045 -wd5220 -WX
+        set FLAGS=-Wall -wd4191 -wd4255 -wd4355 -wd4365 -wd4514 -wd4668 -wd4710 -wd4711 -wd4746 -wd4820 -wd5039 -wd5045 -wd5220 -WX -Zc:preprocessor
         "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" && "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\Common7\IDE\CommonExtensions\Microsoft\CMake\CMake\bin\cmake.exe" .. -G Ninja -DCMAKE_BUILD_TYPE=Release -DENABLE_CUDA=False -DCMAKE_C_FLAGS="-O2 %FLAGS%" -DCMAKE_CXX_FLAGS="-O2 %FLAGS%" && ninja
 
     - name: Build (Clang-CL)

.gitignore

@@ -34,7 +34,10 @@ share/python-wheels/
 *.egg
 MANIFEST
 python/nvtx/_lib/**/*.c
+python/nvtx/_lib/*.c
 python/docs/_build/
+docs/python/.buildinfo.bak
+.doctrees
 
 ### Nsight Systems ###
 *.qdrep

README.md

@@ -196,7 +196,7 @@ Normal (non-IMPORTED) targets will be defined when using CPM (CMake Package Mana
         CPMAddPackage(
             NAME NVTX
             GITHUB_REPOSITORY NVIDIA/NVTX
-            GIT_TAG v3.2.2-c-cpp
+            GIT_TAG v3.3.0-c-cpp
             GIT_SHALLOW TRUE)
 
         add_executable(my_program main.cpp)
@@ -294,7 +294,7 @@ include(path/to/CPM.cmake)
 CPMAddPackage(
     NAME NVTX
     GITHUB_REPOSITORY NVIDIA/NVTX
-    GIT_TAG v3.2.2-c-cpp
+    GIT_TAG v3.3.0-c-cpp
     GIT_SHALLOW TRUE)
 
 # Example C program

c/CMakeLists.txt

@@ -34,7 +34,7 @@ cmake_minimum_required(VERSION 3.19)
 # This allows the same target name to be used for different NVTX versions.
 
 # Project declaration needs to be before the configuration
-project(nvtx3 VERSION 3.2.2)
+project(nvtx3 VERSION 3.3.0)
 
 # Check if standalone or part of another project:
 set(NVTX3_C_ROOT "${CMAKE_CURRENT_SOURCE_DIR}")

c/README.md

@@ -227,3 +227,13 @@ The NVTX C++ API is a header-only library, implemented as a wrapper over the NVT
 - Microsoft Visual C++ (VS 2015 to VS 2022)
     - On VS 2017.7 and newer, NVTX enables better error message output
 - NVIDIA nvcc (CUDA 7.0 and newer)
+
+### C++ version compatibility notes
+
+Minor versions of NVTX releases may introduce new features into the `nvtx3::v1` namespace.
+To use these features, ensure that within each compilation unit, the first inclusion of `nvtx3.hpp` is based at least on this release.
+If an older version is included first, the new features will not be available.
+
+### C++ version history
+
+- v3.3: Add `payload_data` wrapper for `nvtxPayloadData_t` in support of extended payloads.