diff --git a/cmake/rerun_if_needed.py b/cmake/rerun_if_needed.py index 925bb1f2..b8f47e57 100755 --- a/cmake/rerun_if_needed.py +++ b/cmake/rerun_if_needed.py @@ -84,7 +84,7 @@ def get_path_git_hash(path_to_check: str, repo_root: T.Optional[str] = None) -> Changes to untracked files won't affect the hash. """ # Get relative path from possibly absolute path - relative_path = os.path.relpath(path_to_check, repo_root or os.getcwd()) + relative_path = os.path.relpath(path_to_check, repo_root or os.getcwd()).replace("\\", "/") tree_hash, diff_index = _get_hashes(relative_path, cwd=repo_root) diff --git a/symforce/caspar/README.md b/symforce/caspar/README.md index bdc3dfd0..e96c850c 100644 --- a/symforce/caspar/README.md +++ b/symforce/caspar/README.md @@ -110,6 +110,18 @@ The following access patterns are currently supported: +### AMD GPUs (ROCm/HIP) + +Caspar also runs on AMD GPUs through ROCm/HIP. The generated kernels and runtime compile with HIP through a small `cuda_to_hip.h` compatibility header that maps the CUDA runtime calls Caspar emits (`cudaMalloc`, `cudaMemcpy`, `cudaFuncSetAttribute`, and friends) and the `cub` namespace onto their HIP equivalents, so the symbolic kernel definitions are unchanged. + +To build a generated library for AMD GPUs, enable the HIP path when compiling: + +```python +caslib.generate(out_dir) +caslib.compile(out_dir, use_hip=True, hip_arch="gfx90a") +``` + +Set the target AMD GPU via the `hip_arch` argument, for example `gfx90a` for CDNA2 (MI200) or `gfx1100` for RDNA3. Without it, CMake builds for the GPU it detects on the build machine. The build uses CMake's HIP language support, so it needs the ROCm Clang compiler (`amdclang++`; CMake does not accept the `hipcc` wrapper) and the `hip` and `hipcub` packages from a ROCm installation. When `use_hip` is off the build is unchanged and continues to use CUDA. ### Etymology Caspar, an acronym for **C**UDA **A**ccelerator for **S**ymbolic **P**rogramming with **A**daptive **R**eordering, is named after the Danish–Norwegian mathematician [Caspar Wessel](https://en.wikipedia.org/wiki/Caspar_Wessel). Wessel was the first to describe the geometrical interpretation of complex numbers as points in the complex plane and as vectors. However, since his thesis was written in Danish, it initially received little recognition. When his work was rediscovered later, the mathematician Sophus Lie, known for his discovery of Lie algebra, wrote the following in the newspaper: diff --git a/symforce/caspar/code_generation/library.py b/symforce/caspar/code_generation/library.py index a1e452ff..a6da1bd4 100644 --- a/symforce/caspar/code_generation/library.py +++ b/symforce/caspar/code_generation/library.py @@ -180,6 +180,8 @@ def compile( debug: bool = False, cuda_arch: str | None = None, jobs: int | None = None, + use_hip: bool = False, + hip_arch: str | None = None, ) -> None: build_dir = out_dir / "build" config_cmd: list[str | Path] = [ @@ -189,8 +191,15 @@ def compile( "-B", build_dir, f"-DCMAKE_BUILD_TYPE={'Debug' if debug else 'Release'}", - f"-DCMAKE_CUDA_ARCHITECTURES={cuda_arch if cuda_arch is not None else _real_cuda_arch_string()}", ] + if use_hip: + config_cmd.append("-DUSE_HIP=ON") + if hip_arch: + config_cmd.append(f"-DCMAKE_HIP_ARCHITECTURES={hip_arch}") + else: + config_cmd.append( + f"-DCMAKE_CUDA_ARCHITECTURES={cuda_arch if cuda_arch is not None else _real_cuda_arch_string()}" + ) subprocess.run(config_cmd, check=True) build_cmd: list[str | Path] = ["cmake", "--build", build_dir, "--parallel"] if jobs: diff --git a/symforce/caspar/source/runtime/cuda_to_hip.h b/symforce/caspar/source/runtime/cuda_to_hip.h new file mode 100644 index 00000000..122b886b --- /dev/null +++ b/symforce/caspar/source/runtime/cuda_to_hip.h @@ -0,0 +1,75 @@ +/* ---------------------------------------------------------------------------- + * SymForce - Copyright 2025, Skydio, Inc. + * Copyright (c) 2026 Advanced Micro Devices, Inc. + * This source code is under the Apache 2.0 license found in the LICENSE file. + * + * Author: Jeff Daily + * ---------------------------------------------------------------------------- */ + +#pragma once + +// CUDA-to-HIP compatibility header for ROCm/HIP builds. +// Provides the CUDA API spellings the project uses via aliases to HIP equivalents. + +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + +#include + +// Host-only translation units (e.g. code using the generated headers) get just the runtime API. +#if defined(__HIPCC__) +#include +#include +#endif + +// CUDA runtime API -> HIP runtime API +#define cudaMalloc hipMalloc +#define cudaFree hipFree +#define cudaMemset hipMemset +#define cudaMemcpy hipMemcpy +#define cudaMemcpyDeviceToDevice hipMemcpyDeviceToDevice +#define cudaMemcpyDeviceToHost hipMemcpyDeviceToHost +#define cudaMemcpyHostToDevice hipMemcpyHostToDevice +#define cudaError_t hipError_t +#define cudaSuccess hipSuccess +#define cudaStream_t hipStream_t +#define cudaDeviceSynchronize hipDeviceSynchronize +#define cudaGetLastError hipGetLastError +#define cudaGetErrorString hipGetErrorString +#define cudaSetDevice hipSetDevice +#define cudaGetDevice hipGetDevice +#define cudaPointerGetAttributes hipPointerGetAttributes +#define cudaPointerAttributes hipPointerAttribute_t +#define cudaGetDeviceCount hipGetDeviceCount +#define cudaFuncAttributeMaxDynamicSharedMemorySize hipFuncAttributeMaxDynamicSharedMemorySize + +// hipFuncSetAttribute takes the kernel as const void*; CUDA also accepts the kernel itself. +template +inline hipError_t cudaFuncSetAttribute(T* func, hipFuncAttribute attr, int value) { + return hipFuncSetAttribute(reinterpret_cast(func), attr, value); +} + +// HIP shared-memory atomics are block-scoped by definition (no inter-block visibility), +// so atomicAdd_block is equivalent to atomicAdd on shared memory. +#define atomicAdd_block atomicAdd + +#if defined(__HIPCC__) +// CUB -> hipCUB namespace +namespace cub = hipcub; +#endif + +#else // CUDA path + +#include + +// Host-only translation units (e.g. code using the generated headers) get just the runtime API. +#if defined(__CUDACC__) +#include +#include +#include +#include +#include + +namespace cg = cooperative_groups; +#endif + +#endif diff --git a/symforce/caspar/source/runtime/memops.cuh b/symforce/caspar/source/runtime/memops.cuh index 49dc5299..dcdd31f6 100644 --- a/symforce/caspar/source/runtime/memops.cuh +++ b/symforce/caspar/source/runtime/memops.cuh @@ -7,11 +7,7 @@ #include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace cg = cooperative_groups; @@ -260,6 +256,32 @@ __forceinline__ __device__ void FlushSumShared(StorageT* const output, const uin if (idx.argsort != 0xffff) { // 0xffff indicates the thread is not used. unique = indices[indices[idx.argsort].target].unique; } + +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + // HIP lacks cg::labeled_partition; use per-lane atomicAdd fallback. + // The butterfly approach doesn't work for non-contiguous label groups (lanes at + // arbitrary positions share a label, but XOR only pairs specific distances). + // Per-lane atomicAdd is simpler and correct (shared-memory atomics are fast). + +#pragma unroll + for (int i = 0; i < dim_target; i++) { + const SharedIndex idx_inner = indices[threadIdx.x]; + StorageT val = StorageT(0); + if (idx_inner.argsort != 0xffff) { + // Read value BEFORE zeroing (order matters!) + val = inout_shared[idx_inner.argsort * dim_target + i]; + } + __syncthreads(); + inout_shared[threadIdx.x * dim_target + i] = 0.0f; + __syncthreads(); + + if (idx_inner.argsort != 0xffff) { + // Each lane with valid data does its own atomicAdd to the target location + atomicAdd_block(&inout_shared[indices[idx_inner.argsort].target * dim_target + i], val); + } + __syncthreads(); + } +#else const cg::coalesced_group group = cg::labeled_partition(cg::coalesced_threads(), unique); #pragma unroll @@ -279,6 +301,7 @@ __forceinline__ __device__ void FlushSumShared(StorageT* const output, const uin } __syncthreads(); } +#endif constexpr uint dim_aligned = dim_target == 3 ? 4 : dim_target; for (int i = 0; i < dim_target; i++) { @@ -303,6 +326,29 @@ template __forceinline__ __device__ void FlushSumBlock(StorageT* const output, StorageT* const inout_shared, const bool valid) { __syncthreads(); +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + // HIP coalesced_group lacks shfl_xor; use shared-memory atomics directly. + constexpr uint dim_aligned = dim_target == 3 ? 4 : dim_target; + +#pragma unroll + for (int i = 0; i < dim_target; i++) { + StorageT val = StorageT(0); + if (valid) { + val = inout_shared[threadIdx.x * dim_target + i]; + } + __syncthreads(); + inout_shared[threadIdx.x * dim_target + i] = 0.0f; + __syncthreads(); + + if (valid) { + atomicAdd_block(&inout_shared[i], val); + } + __syncthreads(); + } + for (int i = threadIdx.x; i < dim_target; i += blockDim.x) { + output[blockIdx.x * dim_aligned + i] = inout_shared[i]; + } +#else const cg::coalesced_group group = cg::binary_partition(cg::coalesced_threads(), valid); constexpr uint dim_aligned = dim_target == 3 ? 4 : dim_target; @@ -326,6 +372,7 @@ __forceinline__ __device__ void FlushSumBlock(StorageT* const output, StorageT* for (int i = threadIdx.x; i < dim_target; i += blockDim.x) { output[blockIdx.x * dim_aligned + i] = inout_shared[i]; } +#endif } template __forceinline__ __device__ void SumStore(StorageT* const shared_tmp, StorageT* const inout_shared, @@ -333,13 +380,28 @@ __forceinline__ __device__ void SumStore(StorageT* const shared_tmp, StorageT* c auto group = cg::tiled_partition<32>(cg::this_thread_block()); __syncthreads(); +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + // HIP lacks cg::reduce; use butterfly reduction within the tile + StorageT tot = valid ? data : StorageT(0); + for (unsigned int o = group.size() / 2; o > 0; o >>= 1) { + tot += group.shfl_xor(tot, o); + } +#else StorageT tot = cg::reduce(group, valid ? data : 0.0f, cg::plus()); +#endif if (group.thread_rank() == 0) { inout_shared[group.meta_group_rank()] = tot; } __syncthreads(); if (group.meta_group_rank() == 0) { +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + tot = inout_shared[group.thread_rank()]; + for (unsigned int o = group.size() / 2; o > 0; o >>= 1) { + tot += group.shfl_xor(tot, o); + } +#else tot = cg::reduce(group, inout_shared[group.thread_rank()], cg::plus()); +#endif if (group.thread_rank() == 0) { shared_tmp[offset] = tot; } @@ -364,6 +426,29 @@ template __forceinline__ __device__ void FlushSumBlockAdd(StorageT* const output, StorageT* const inout_shared, const bool valid) { __syncthreads(); +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + // HIP coalesced_group lacks shfl_xor; use shared-memory atomics directly. + constexpr uint dim_aligned = dim_target == 3 ? 4 : dim_target; + +#pragma unroll + for (int i = 0; i < dim_target; i++) { + StorageT val = StorageT(0); + if (valid) { + val = inout_shared[threadIdx.x * dim_target + i]; + } + __syncthreads(); + inout_shared[threadIdx.x * dim_target + i] = 0.0f; + __syncthreads(); + + if (valid) { + atomicAdd_block(&inout_shared[i], val); + } + __syncthreads(); + } + for (int i = threadIdx.x; i < dim_target; i += blockDim.x) { + output[blockIdx.x * dim_aligned + i] += inout_shared[i]; + } +#else const cg::coalesced_group group = cg::binary_partition(cg::coalesced_threads(), valid); constexpr uint dim_aligned = dim_target == 3 ? 4 : dim_target; @@ -387,6 +472,7 @@ __forceinline__ __device__ void FlushSumBlockAdd(StorageT* const output, for (int i = threadIdx.x; i < dim_target; i += blockDim.x) { output[blockIdx.x * dim_aligned + i] += inout_shared[i]; } +#endif } // READ SHARED diff --git a/symforce/caspar/source/runtime/pybind_array_tools.cc b/symforce/caspar/source/runtime/pybind_array_tools.cc index 9e43f198..db221163 100644 --- a/symforce/caspar/source/runtime/pybind_array_tools.cc +++ b/symforce/caspar/source/runtime/pybind_array_tools.cc @@ -174,6 +174,17 @@ int GetDeviceId(const py::object& obj) { auto interface = obj.attr("__cuda_array_interface__").cast(); auto data = interface["data"].cast(); void* ptr = reinterpret_cast(data[0].cast()); + // This host translation unit calls the HIP runtime directly rather than + // including cuda_to_hip.h, which also pulls in hipcub. +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + hipPointerAttribute_t attrs; + hipError_t err = hipPointerGetAttributes(&attrs, ptr); + if (err != hipSuccess) { + hipGetLastError(); + return -1; + } + return attrs.device; +#else cudaPointerAttributes attrs; cudaError_t err = cudaPointerGetAttributes(&attrs, ptr); if (err != cudaSuccess) { @@ -181,6 +192,7 @@ int GetDeviceId(const py::object& obj) { return -1; } return attrs.device; +#endif } catch (...) { return -1; // Fallback if interface or attributes aren't available } diff --git a/symforce/caspar/source/runtime/pybind_array_tools.h b/symforce/caspar/source/runtime/pybind_array_tools.h index 96445288..1e938ed6 100644 --- a/symforce/caspar/source/runtime/pybind_array_tools.h +++ b/symforce/caspar/source/runtime/pybind_array_tools.h @@ -14,7 +14,11 @@ #pragma once +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) +#include +#else #include +#endif #include namespace py = pybind11; diff --git a/symforce/caspar/source/runtime/shared_indices.cu b/symforce/caspar/source/runtime/shared_indices.cu index f3d20c61..ecc4baab 100644 --- a/symforce/caspar/source/runtime/shared_indices.cu +++ b/symforce/caspar/source/runtime/shared_indices.cu @@ -3,10 +3,7 @@ * This source code is under the Apache 2.0 license found in the LICENSE file. * ---------------------------------------------------------------------------- */ -#include -#include -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace cg = cooperative_groups; @@ -111,16 +108,31 @@ __forceinline__ __device__ uint GetOrd(const uint* values, const uint length, co __global__ void SharedIndicesKernel(const uint* const __restrict__ indices, SharedIndex* const __restrict__ shared_indices_out, const uint size) { - const auto block = cg::this_thread_block(); + auto block = cg::this_thread_block(); const auto gtrank = cg::this_grid().thread_rank(); const auto btrank = block.thread_rank(); +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + // HIP's group_dim() is non-const; use blockDim directly + const int start = blockIdx.x * blockDim.x; +#else const int start = block.group_index().x * block.group_dim().x; +#endif const int num = min(1024, size - start) * sizeof(uint); __shared__ uint indices_loc[1024]; +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) + // HIP lacks cg::memcpy_async; use synchronous block-strided copy + const uint* src = indices + start; + const uint num_elements = num / sizeof(uint); + for (uint i = btrank; i < num_elements; i += block.size()) { + indices_loc[i] = src[i]; + } + __syncthreads(); +#else cg::memcpy_async(block, indices_loc, indices + start, num); cg::wait(block); +#endif const uint val = gtrank < size ? indices_loc[btrank] : 0xFFFFFFFF; diff --git a/symforce/caspar/source/runtime/shared_indices.h b/symforce/caspar/source/runtime/shared_indices.h index 8b2db65e..e40fed15 100644 --- a/symforce/caspar/source/runtime/shared_indices.h +++ b/symforce/caspar/source/runtime/shared_indices.h @@ -7,7 +7,11 @@ #include +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) +#include +#else #include +#endif namespace caspar { diff --git a/symforce/caspar/source/runtime/solver_tools.cu b/symforce/caspar/source/runtime/solver_tools.cu index 5954fb04..ca19dc0f 100644 --- a/symforce/caspar/source/runtime/solver_tools.cu +++ b/symforce/caspar/source/runtime/solver_tools.cu @@ -3,9 +3,7 @@ * This source code is under the Apache 2.0 license found in the LICENSE file. * ---------------------------------------------------------------------------- */ -#include -#include - +#include "cuda_to_hip.h" #include "solver_tools.h" namespace caspar { diff --git a/symforce/caspar/source/runtime/sort_indices.cu b/symforce/caspar/source/runtime/sort_indices.cu index 0e1356ec..ad14e711 100644 --- a/symforce/caspar/source/runtime/sort_indices.cu +++ b/symforce/caspar/source/runtime/sort_indices.cu @@ -3,8 +3,7 @@ * This source code is under the Apache 2.0 license found in the LICENSE file. * ---------------------------------------------------------------------------- */ -#include - +#include "cuda_to_hip.h" #include "sort_indices.h" namespace { diff --git a/symforce/caspar/source/runtime/sort_indices.h b/symforce/caspar/source/runtime/sort_indices.h index 2fbeeb1a..700622d8 100644 --- a/symforce/caspar/source/runtime/sort_indices.h +++ b/symforce/caspar/source/runtime/sort_indices.h @@ -5,23 +5,28 @@ #pragma once -#include +#include +#if defined(USE_HIP) || defined(__HIP_PLATFORM_AMD__) +#include +#else #include +#endif namespace caspar { size_t SortIndicesGetTmpNbytes(size_t problem_size); -void SortIndices(void* tmp_storage, size_t tmp_storage_bytes, const uint* keys_in, uint* sorted_out, - uint* target_out, uint* argsort_out, size_t problem_size); +void SortIndices(void* tmp_storage, size_t tmp_storage_bytes, const unsigned int* keys_in, + unsigned int* sorted_out, unsigned int* target_out, unsigned int* argsort_out, + size_t problem_size); size_t SortKeysGetTmpNbytes(size_t problem_size); -void SortKeys(void* tmp_storage, size_t tmp_storage_bytes, const uint* keys_in, uint* sorted_out, - size_t problem_size); +void SortKeys(void* tmp_storage, size_t tmp_storage_bytes, const unsigned int* keys_in, + unsigned int* sorted_out, size_t problem_size); -void SelectIndex(const uint* const input, const uint* const selections, uint* const output, - size_t problem_size); +void SelectIndex(const unsigned int* const input, const unsigned int* const selections, + unsigned int* const output, size_t problem_size); } // namespace caspar diff --git a/symforce/caspar/source/templates/buildfiles/CMakeLists.txt.jinja b/symforce/caspar/source/templates/buildfiles/CMakeLists.txt.jinja index 1f89d62c..d40eca2e 100644 --- a/symforce/caspar/source/templates/buildfiles/CMakeLists.txt.jinja +++ b/symforce/caspar/source/templates/buildfiles/CMakeLists.txt.jinja @@ -4,20 +4,34 @@ # ---------------------------------------------------------------------------- #} cmake_minimum_required(VERSION 3.18) -if(NOT DEFINED CMAKE_CUDA_COMPILER AND DEFINED ENV{CUDACXX}) - set(CMAKE_CUDA_COMPILER "$ENV{CUDACXX}" CACHE FILEPATH "CUDA compiler") -endif() +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) -project(caspar_library LANGUAGES CXX CUDA) +option(USE_HIP "Build with HIP for AMD GPUs" OFF) -set(CASPAR_MIN_ARCH 75 CACHE INTERNAL "Minimum CUDA arch required by Caspar") +if(USE_HIP) + # project(... LANGUAGES ... HIP) honors -DCMAKE_HIP_ARCHITECTURES, otherwise + # auto-detects the host GPU and errors on a no-GPU build host. + project(caspar_library LANGUAGES CXX HIP) -# SASS for Turing/Ampere/Ada (sm_75–89) + PTX fallback for forward JIT-compatibility. sm_75 minimum required by cooperative_groups::reduce. -if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) - set(CMAKE_CUDA_ARCHITECTURES ${CASPAR_MIN_ARCH} 80-real 86-real 89-real) -endif() + find_package(hip REQUIRED) + find_package(hipcub REQUIRED) +else() + if(NOT DEFINED CMAKE_CUDA_COMPILER AND DEFINED ENV{CUDACXX}) + set(CMAKE_CUDA_COMPILER "$ENV{CUDACXX}" CACHE FILEPATH "CUDA compiler") + endif() -find_package(CUDAToolkit REQUIRED) + project(caspar_library LANGUAGES CXX CUDA) + + set(CASPAR_MIN_ARCH 75 CACHE INTERNAL "Minimum CUDA arch required by Caspar") + + # SASS for Turing/Ampere/Ada (sm_75–89) + PTX fallback for forward JIT-compatibility. sm_75 minimum required by cooperative_groups::reduce. + if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) + set(CMAKE_CUDA_ARCHITECTURES ${CASPAR_MIN_ARCH} 80-real 86-real 89-real) + endif() + + find_package(CUDAToolkit REQUIRED) +endif() {% if python_bindings %} option(CASPAR_BUILD_PYTHON_BINDINGS "Build Python bindings via pybind11" ON) @@ -47,10 +61,31 @@ list(FILTER CUDA_HEADERS EXCLUDE REGEX "pybind.*") add_library({{caslib.name}}_core STATIC ${CUDA_SOURCES} ${CUDA_HEADERS}) target_include_directories({{caslib.name}}_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries({{caslib.name}}_core PUBLIC CUDA::cudart) -target_compile_options({{caslib.name}}_core PRIVATE - $<$:--use_fast_math> -) + +if(USE_HIP) + # Mark .cu files as HIP language + set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE HIP) + target_compile_definitions({{caslib.name}}_core PUBLIC USE_HIP) + # Link hip targets PRIVATE to avoid propagating HIP compile options to pure-CXX consumers. + # The static library has the HIP code linked in; pybind consumers only need the includes. + target_link_libraries({{caslib.name}}_core PRIVATE hip::host hip::hipcub) + # Expose ROCm include directory for consumers that need hipError_t etc + target_include_directories({{caslib.name}}_core PUBLIC ${hip_INCLUDE_DIRS}) + # Use -ffp-contract=fast -fno-math-errno instead of -ffast-math. + # clang's -ffast-math enables -fassociative-math which can NaN backward passes. + target_compile_options({{caslib.name}}_core PRIVATE + $<$:-ffp-contract=fast -fno-math-errno> + ) + set_target_properties({{caslib.name}}_core PROPERTIES + HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}" + ) +else() + target_link_libraries({{caslib.name}}_core PUBLIC CUDA::cudart) + target_compile_options({{caslib.name}}_core PRIVATE + $<$:--use_fast_math> + ) +endif() + set_target_properties({{caslib.name}}_core PROPERTIES POSITION_INDEPENDENT_CODE ON ) @@ -62,6 +97,12 @@ if(CASPAR_BUILD_PYTHON_BINDINGS) pybind11_add_module({{caslib.name}} ${CPP_SOURCES} ${CPP_HEADERS}) target_link_libraries({{caslib.name}} PRIVATE {{caslib.name}}_core) + if(USE_HIP) + # Compile pybind sources as HIP (so HIP headers work) but they have no device code. + # The HIP compiler handles them as host-only code. + set_source_files_properties(${CPP_SOURCES} PROPERTIES LANGUAGE HIP) + endif() + set_target_properties({{caslib.name}} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/symforce/caspar/source/templates/caspar_mappings.cu.jinja b/symforce/caspar/source/templates/caspar_mappings.cu.jinja index eb398676..ac314bf0 100644 --- a/symforce/caspar/source/templates/caspar_mappings.cu.jinja +++ b/symforce/caspar/source/templates/caspar_mappings.cu.jinja @@ -4,13 +4,10 @@ # ---------------------------------------------------------------------------- #} #include -#include -#include +#include "cuda_to_hip.h" #include "caspar_mappings.h" -namespace cg = cooperative_groups; - // We use shared memory to improve the memory access. // A smaller block size of 32 allows for larger nodetypes. constexpr int block_size = 32; diff --git a/symforce/caspar/source/templates/caspar_mappings.h.jinja b/symforce/caspar/source/templates/caspar_mappings.h.jinja index af3795ad..53684205 100644 --- a/symforce/caspar/source/templates/caspar_mappings.h.jinja +++ b/symforce/caspar/source/templates/caspar_mappings.h.jinja @@ -4,7 +4,7 @@ # ---------------------------------------------------------------------------- #} #pragma once -#include +#include "cuda_to_hip.h" namespace caspar { {% for nodetype in caslib.exposed_types%} diff --git a/symforce/caspar/source/templates/kernel.cu.jinja b/symforce/caspar/source/templates/kernel.cu.jinja index c0965af5..3660df7b 100644 --- a/symforce/caspar/source/templates/kernel.cu.jinja +++ b/symforce/caspar/source/templates/kernel.cu.jinja @@ -2,11 +2,7 @@ # SymForce - Copyright 2025, Skydio, Inc. # This source code is under the Apache 2.0 license found in the LICENSE file. # ---------------------------------------------------------------------------- #} -#include -#include -#include -#include -#include +#include "cuda_to_hip.h" #include #include @@ -14,8 +10,6 @@ #include "kernel_{{kernel.name}}.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void diff --git a/symforce/caspar/source/templates/kernel.h.jinja b/symforce/caspar/source/templates/kernel.h.jinja index 476a50e4..8c189f4c 100644 --- a/symforce/caspar/source/templates/kernel.h.jinja +++ b/symforce/caspar/source/templates/kernel.h.jinja @@ -4,7 +4,7 @@ # ---------------------------------------------------------------------------- #} #pragma once -#include +#include "cuda_to_hip.h" #include "shared_indices.h" diff --git a/symforce/caspar/source/templates/solver.cc.jinja b/symforce/caspar/source/templates/solver.cc.jinja index 9d15f5c5..1119f1a5 100644 --- a/symforce/caspar/source/templates/solver.cc.jinja +++ b/symforce/caspar/source/templates/solver.cc.jinja @@ -7,6 +7,9 @@ #include #include #include +#include +#include +#include #include "caspar_mappings.h" #include "shared_indices.h" @@ -535,6 +538,7 @@ void {{ solver.struct_name }}::DoUpdateStep() { void {{ solver.struct_name }}::DoUpdateRFirst() { Zero({{solver_key("r_0_norm2_tot")}}, {{solver_key("r_0_norm2_tot")}}+1); + Zero({{solver_key("r_kp1_norm2_tot")}}, {{solver_key("r_kp1_norm2_tot")}}+1); {% for nodetype in solver.node_types %} {{nodetype.__name__}}UpdateRFirst( diff --git a/symforce/caspar/source/templates/solver.h.jinja b/symforce/caspar/source/templates/solver.h.jinja index 855a9789..c9a35c7a 100644 --- a/symforce/caspar/source/templates/solver.h.jinja +++ b/symforce/caspar/source/templates/solver.h.jinja @@ -6,7 +6,7 @@ #include -#include +#include "cuda_to_hip.h" #include diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 8a34770d..3d1892f4 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -47,7 +47,7 @@ target_compile_definitions( file(GLOB SYMFORCE_TEST_CC_SOURCES CONFIGURE_DEPENDS *_test.cc) -# *_cuda_test.cc tests are built below, only when a CUDA compiler is available. +# *_cuda_test.cc tests are built below, only when a CUDA or HIP compiler is available. file(GLOB SYMFORCE_CUDA_TEST_CC_SOURCES CONFIGURE_DEPENDS *_cuda_test.cc) list(REMOVE_ITEM SYMFORCE_TEST_CC_SOURCES ${SYMFORCE_CUDA_TEST_CC_SOURCES}) @@ -80,9 +80,21 @@ endforeach() include(CheckLanguage) check_language(CUDA) -if(CMAKE_CUDA_COMPILER) - enable_language(CUDA) - find_package(CUDAToolkit REQUIRED) +if(NOT CMAKE_CUDA_COMPILER AND CMAKE_VERSION VERSION_GREATER_EQUAL 3.21) + # Without CUDA, build the same tests for AMD GPUs with HIP. With no AMD GPU on the build host, + # pass -DCMAKE_HIP_ARCHITECTURES (e.g. gfx90a) to build them anyway. + check_language(HIP) +endif() + +if(CMAKE_CUDA_COMPILER OR CMAKE_HIP_COMPILER) + if(CMAKE_CUDA_COMPILER) + enable_language(CUDA) + find_package(CUDAToolkit REQUIRED) + else() + enable_language(HIP) + find_package(hip REQUIRED) + find_package(hipcub REQUIRED) + endif() set(CASPAR_RUNTIME_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../symforce/caspar/source/runtime) set(CASPAR_TEST_DATA_DIR ${CMAKE_CURRENT_SOURCE_DIR}/symforce_function_codegen_test_data/symengine) @@ -92,11 +104,23 @@ if(CMAKE_CUDA_COMPILER) ${CASPAR_RUNTIME_DIR}/sort_indices.cu ${CASPAR_RUNTIME_DIR}/solver_tools.cu ) - set_target_properties(caspar_test_runtime PROPERTIES - CUDA_ARCHITECTURES 75 # Minimum for cooperative_groups::reduce - ) target_include_directories(caspar_test_runtime PUBLIC ${CASPAR_RUNTIME_DIR}) - target_link_libraries(caspar_test_runtime PUBLIC CUDA::cudart) + if(CMAKE_CUDA_COMPILER) + set_target_properties(caspar_test_runtime PROPERTIES + CUDA_ARCHITECTURES 75 # Minimum for cooperative_groups::reduce + ) + target_link_libraries(caspar_test_runtime PUBLIC CUDA::cudart) + else() + get_target_property(CASPAR_RUNTIME_SOURCES caspar_test_runtime SOURCES) + set_source_files_properties(${CASPAR_RUNTIME_SOURCES} PROPERTIES LANGUAGE HIP) + target_compile_definitions(caspar_test_runtime PUBLIC USE_HIP) + # hip::hipcub also carries hip::device, whose -x hip would reach the host-compiled .cc test + # sources below. hipCUB and rocPRIM are header-only, so take just their headers. + target_link_libraries(caspar_test_runtime PUBLIC hip::host roc::rocprim) + target_include_directories(caspar_test_runtime PUBLIC + $ + ) + endif() # Each caspar__cuda_test.cc runs the code generated into symforce_caspar__test, # except caspar_padding_lane_cuda_test, whose kernel symforce_caspar_codegen_test generates @@ -117,6 +141,14 @@ if(CMAKE_CUDA_COMPILER) file(GLOB DATA_SOURCES CONFIGURE_DEPENDS ${DATA_DIR}/*.cu ${DATA_DIR}/*.cc) add_executable(${TARGET_NAME} ${SOURCE_FILE} ${DATA_SOURCES}) + if(CMAKE_HIP_COMPILER) + # Only the .cu files are HIP. The test and generated .cc files stay with the host C++ + # compiler, as in the CUDA build, so the generated headers are checked to be includable + # from host code. + set(HIP_SOURCES ${DATA_SOURCES}) + list(FILTER HIP_SOURCES INCLUDE REGEX "\\.cu$") + set_source_files_properties(${HIP_SOURCES} PROPERTIES LANGUAGE HIP) + endif() set_target_properties(${TARGET_NAME} PROPERTIES CUDA_ARCHITECTURES 75 OUTPUT_NAME ${BINARY_NAME} diff --git a/test/caspar_backend_coverage_cuda_test.cc b/test/caspar_backend_coverage_cuda_test.cc index 71dfabe8..47c2fc7a 100644 --- a/test/caspar_backend_coverage_cuda_test.cc +++ b/test/caspar_backend_coverage_cuda_test.cc @@ -9,9 +9,9 @@ #include #include -#include #include "backend_test_function_expected.h" +#include "cuda_to_hip.h" #include "kernel_backend_test_function.h" namespace { diff --git a/test/caspar_padding_lane_cuda_test.cc b/test/caspar_padding_lane_cuda_test.cc index a7e2ea9a..4848b63a 100644 --- a/test/caspar_padding_lane_cuda_test.cc +++ b/test/caspar_padding_lane_cuda_test.cc @@ -8,8 +8,8 @@ #include #include -#include +#include "cuda_to_hip.h" #include "kernel_caspar_padding_lane_score.h" #include "shared_indices.h" diff --git a/test/caspar_solver_cuda_test.cc b/test/caspar_solver_cuda_test.cc index bce016fe..259b6d9c 100644 --- a/test/caspar_solver_cuda_test.cc +++ b/test/caspar_solver_cuda_test.cc @@ -9,8 +9,8 @@ #include #include -#include +#include "cuda_to_hip.h" #include "solver.h" namespace { diff --git a/test/caspar_tridiagonal_cuda_test.cc b/test/caspar_tridiagonal_cuda_test.cc index 0f303918..0a04c2df 100644 --- a/test/caspar_tridiagonal_cuda_test.cc +++ b/test/caspar_tridiagonal_cuda_test.cc @@ -10,8 +10,8 @@ #include #include #include -#include +#include "cuda_to_hip.h" #include "symforce_caspar_tridiagonal_test/solver.h" namespace { diff --git a/test/symforce_caspar_codegen_test.py b/test/symforce_caspar_codegen_test.py index e7824349..33843535 100644 --- a/test/symforce_caspar_codegen_test.py +++ b/test/symforce_caspar_codegen_test.py @@ -55,6 +55,14 @@ / "symforce_caspar_backend_coverage_test" ) +BUILD_FILES_TEST_DATA_DIR = ( + path_util.symforce_data_root(__file__) + / "test" + / "symforce_function_codegen_test_data" + / symforce.get_symbolic_api() + / "symforce_caspar_build_files_test" +) + KERNEL_FILENAMES = ( "kernel_caspar_padding_lane_score.cu", "kernel_caspar_padding_lane_score.h", @@ -326,6 +334,27 @@ def test_generate_backend_coverage_kernel(self) -> None: self.compare_or_update_directory(kernel_dir, BACKEND_COVERAGE_TEST_DATA_DIR) + @symengine_only + def test_generate_build_files(self) -> None: + """ + Keep the generated CMakeLists.txt up to date, with and without Python bindings. It holds + the only generated code that differs between the CUDA and HIP builds. + """ + output_dir = self.make_output_dir("sf_caspar_build_files_") + caslib = _make_padding_lane_library() + + build_files_dir = output_dir / "build_files" + build_files_dir.mkdir() + for python_bindings in (False, True): + generated_dir = output_dir / f"python_bindings_{python_bindings}" + generated_dir.mkdir() + caslib.generate_buildfiles(generated_dir, python_bindings=python_bindings) + for path in generated_dir.iterdir(): + suffix = "_python_bindings" if python_bindings else "" + (build_files_dir / f"{path.stem}{suffix}{path.suffix}").write_text(path.read_text()) + + self.compare_or_update_directory(build_files_dir, BUILD_FILES_TEST_DATA_DIR) + @symengine_only def test_generate_solver(self) -> None: """ diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.cu index 7827509c..6224331e 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_backend_test_function.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.h index 7f37a3b3..82ce6477 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_backend_coverage_test/kernel_backend_test_function.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_build_files_test/CMakeLists.txt b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_build_files_test/CMakeLists.txt new file mode 100644 index 00000000..c4d72201 --- /dev/null +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_build_files_test/CMakeLists.txt @@ -0,0 +1,67 @@ +cmake_minimum_required(VERSION 3.18) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +option(USE_HIP "Build with HIP for AMD GPUs" OFF) + +if(USE_HIP) + # project(... LANGUAGES ... HIP) honors -DCMAKE_HIP_ARCHITECTURES, otherwise + # auto-detects the host GPU and errors on a no-GPU build host. + project(caspar_library LANGUAGES CXX HIP) + + find_package(hip REQUIRED) + find_package(hipcub REQUIRED) +else() + if(NOT DEFINED CMAKE_CUDA_COMPILER AND DEFINED ENV{CUDACXX}) + set(CMAKE_CUDA_COMPILER "$ENV{CUDACXX}" CACHE FILEPATH "CUDA compiler") + endif() + + project(caspar_library LANGUAGES CXX CUDA) + + set(CASPAR_MIN_ARCH 75 CACHE INTERNAL "Minimum CUDA arch required by Caspar") + + # SASS for Turing/Ampere/Ada (sm_75–89) + PTX fallback for forward JIT-compatibility. sm_75 minimum required by cooperative_groups::reduce. + if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) + set(CMAKE_CUDA_ARCHITECTURES ${CASPAR_MIN_ARCH} 80-real 86-real 89-real) + endif() + + find_package(CUDAToolkit REQUIRED) +endif() + +file(GLOB CUDA_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cu" "*.cc") +list(FILTER CUDA_SOURCES EXCLUDE REGEX "pybind.*") +file(GLOB CUDA_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cuh" "*.h") +list(FILTER CUDA_HEADERS EXCLUDE REGEX "pybind.*") + +add_library(caspar_lib_core STATIC ${CUDA_SOURCES} ${CUDA_HEADERS}) +target_include_directories(caspar_lib_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +if(USE_HIP) + # Mark .cu files as HIP language + set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE HIP) + target_compile_definitions(caspar_lib_core PUBLIC USE_HIP) + # Link hip targets PRIVATE to avoid propagating HIP compile options to pure-CXX consumers. + # The static library has the HIP code linked in; pybind consumers only need the includes. + target_link_libraries(caspar_lib_core PRIVATE hip::host hip::hipcub) + # Expose ROCm include directory for consumers that need hipError_t etc + target_include_directories(caspar_lib_core PUBLIC ${hip_INCLUDE_DIRS}) + # Use -ffp-contract=fast -fno-math-errno instead of -ffast-math. + # clang's -ffast-math enables -fassociative-math which can NaN backward passes. + target_compile_options(caspar_lib_core PRIVATE + $<$:-ffp-contract=fast -fno-math-errno> + ) + set_target_properties(caspar_lib_core PROPERTIES + HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}" + ) +else() + target_link_libraries(caspar_lib_core PUBLIC CUDA::cudart) + target_compile_options(caspar_lib_core PRIVATE + $<$:--use_fast_math> + ) +endif() + +set_target_properties(caspar_lib_core PROPERTIES + POSITION_INDEPENDENT_CODE ON +) + diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_build_files_test/CMakeLists_python_bindings.txt b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_build_files_test/CMakeLists_python_bindings.txt new file mode 100644 index 00000000..6bb71efd --- /dev/null +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_build_files_test/CMakeLists_python_bindings.txt @@ -0,0 +1,103 @@ +cmake_minimum_required(VERSION 3.18) + +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + +option(USE_HIP "Build with HIP for AMD GPUs" OFF) + +if(USE_HIP) + # project(... LANGUAGES ... HIP) honors -DCMAKE_HIP_ARCHITECTURES, otherwise + # auto-detects the host GPU and errors on a no-GPU build host. + project(caspar_library LANGUAGES CXX HIP) + + find_package(hip REQUIRED) + find_package(hipcub REQUIRED) +else() + if(NOT DEFINED CMAKE_CUDA_COMPILER AND DEFINED ENV{CUDACXX}) + set(CMAKE_CUDA_COMPILER "$ENV{CUDACXX}" CACHE FILEPATH "CUDA compiler") + endif() + + project(caspar_library LANGUAGES CXX CUDA) + + set(CASPAR_MIN_ARCH 75 CACHE INTERNAL "Minimum CUDA arch required by Caspar") + + # SASS for Turing/Ampere/Ada (sm_75–89) + PTX fallback for forward JIT-compatibility. sm_75 minimum required by cooperative_groups::reduce. + if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES) + set(CMAKE_CUDA_ARCHITECTURES ${CASPAR_MIN_ARCH} 80-real 86-real 89-real) + endif() + + find_package(CUDAToolkit REQUIRED) +endif() + +option(CASPAR_BUILD_PYTHON_BINDINGS "Build Python bindings via pybind11" ON) + +if(CASPAR_BUILD_PYTHON_BINDINGS) + include(FetchContent) + find_package(pybind11 2.13.6 QUIET) + if(NOT pybind11_FOUND) + message(STATUS "pybind11 not found, adding with FetchContent") + FetchContent_Declare( + pybind11 + URL https://github.com/pybind/pybind11/archive/v2.13.6.zip + URL_HASH SHA256=d0a116e91f64a4a2d8fb7590c34242df92258a61ec644b79127951e821b47be6 + DOWNLOAD_EXTRACT_TIMESTAMP TRUE + ) + FetchContent_MakeAvailable(pybind11) + else() + message(STATUS "pybind11 found") + endif() +endif() + +file(GLOB CUDA_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cu" "*.cc") +list(FILTER CUDA_SOURCES EXCLUDE REGEX "pybind.*") +file(GLOB CUDA_HEADERS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cuh" "*.h") +list(FILTER CUDA_HEADERS EXCLUDE REGEX "pybind.*") + +add_library(caspar_lib_core STATIC ${CUDA_SOURCES} ${CUDA_HEADERS}) +target_include_directories(caspar_lib_core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +if(USE_HIP) + # Mark .cu files as HIP language + set_source_files_properties(${CUDA_SOURCES} PROPERTIES LANGUAGE HIP) + target_compile_definitions(caspar_lib_core PUBLIC USE_HIP) + # Link hip targets PRIVATE to avoid propagating HIP compile options to pure-CXX consumers. + # The static library has the HIP code linked in; pybind consumers only need the includes. + target_link_libraries(caspar_lib_core PRIVATE hip::host hip::hipcub) + # Expose ROCm include directory for consumers that need hipError_t etc + target_include_directories(caspar_lib_core PUBLIC ${hip_INCLUDE_DIRS}) + # Use -ffp-contract=fast -fno-math-errno instead of -ffast-math. + # clang's -ffast-math enables -fassociative-math which can NaN backward passes. + target_compile_options(caspar_lib_core PRIVATE + $<$:-ffp-contract=fast -fno-math-errno> + ) + set_target_properties(caspar_lib_core PROPERTIES + HIP_ARCHITECTURES "${CMAKE_HIP_ARCHITECTURES}" + ) +else() + target_link_libraries(caspar_lib_core PUBLIC CUDA::cudart) + target_compile_options(caspar_lib_core PRIVATE + $<$:--use_fast_math> + ) +endif() + +set_target_properties(caspar_lib_core PROPERTIES + POSITION_INDEPENDENT_CODE ON +) + +if(CASPAR_BUILD_PYTHON_BINDINGS) + file(GLOB CPP_SOURCES "pybind*.cc") + + pybind11_add_module(caspar_lib ${CPP_SOURCES} ${CPP_HEADERS}) + target_link_libraries(caspar_lib PRIVATE caspar_lib_core) + + if(USE_HIP) + # Compile pybind sources as HIP (so HIP headers work) but they have no device code. + # The HIP compiler handles them as host-only code. + set_source_files_properties(${CPP_SOURCES} PROPERTIES LANGUAGE HIP) + endif() + + set_target_properties(caspar_lib PROPERTIES + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + ) +endif() diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.cu index 82e4d136..4ee6d7d5 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_caspar_padding_lane_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) CasparPaddingLaneScoreKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.h index a78f744a..1c779f24 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_codegen_test/kernel_caspar_padding_lane_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.cu index 7edd0f2b..9c68da60 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.cu @@ -1,11 +1,7 @@ #include -#include -#include - #include "caspar_mappings.h" - -namespace cg = cooperative_groups; +#include "cuda_to_hip.h" // We use shared memory to improve the memory access. // A smaller block size of 32 allows for larger nodetypes. diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.h index 4b4c2719..ebe55ef9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/caspar_mappings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "cuda_to_hip.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.cu index 1331046a..95c8344a 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_alpha_denominator_or_beta_numerator.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) Matrix21AlphaDenominatorOrBetaNumeratorKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.h index fe955dba..7a3bbf55 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_denominator_or_beta_numerator.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.cu index f90df48a..ea6c5e3c 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_alpha_numerator_denominator.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) Matrix21AlphaNumeratorDenominatorKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.h index 863a162c..7e9a4fb2 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_alpha_numerator_denominator.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.cu index 65302139..7ff9c296 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_normalize.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.h index c6db2e2f..7b39f71c 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_normalize.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.cu index 44488925..fc96efd7 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_pred_decrease_times_two.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.h index 4e8ad4e1..1ee881bc 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_pred_decrease_times_two.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.cu index 14e7d572..318990d6 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_retract.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.h index 1219c59d..5c0eb51a 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_retract.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.cu index 1a370cb0..f0cfdd0a 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_start_w.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.h index fa1e7963..f34294fc 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.cu index 95c95c4c..ce0d8a0d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_start_w_contribute.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.h index 67a41b95..f5de02be 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_start_w_contribute.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.cu index 49611002..dcb0c2ca 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_update_Mp.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.h index 4e3352d5..28a45178 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_Mp.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.cu index eee35a76..4b7ca93b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_update_p.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.h index a6ea4824..847f2b40 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_p.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.cu index 2dca6a4e..83b4dd6c 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_update_r.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.h index 33ce7fea..2ae46944 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.cu index 9519aa50..2908c211 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_update_r_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.h index 24f801d0..1e869640 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_r_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.cu index fdcbc605..b0387b24 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_update_step.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.h index e1709af9..b0a2ceb5 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.cu index 7bf44110..498da5b0 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_Matrix21_update_step_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.h index bbf51fa9..4f1ae077 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_Matrix21_update_step_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.cu index 956e7b88..df820641 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_rosenbrock_jtjnjtr_direct.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.h index f0556d5f..1af63135 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_jtjnjtr_direct.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.cu index 8c17c53f..e237c533 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_rosenbrock_res_jac.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.h index 84617734..ad7a2e6c 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.cu index 94cdbac1..3c67e39d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_rosenbrock_res_jac_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.h index c2186b6e..44c70fe1 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_res_jac_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.cu index 0932d18e..dd4afec3 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_rosenbrock_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.h index aee00b4e..43f4b867 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/kernel_rosenbrock_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.cc b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.cc index 1bfb4c03..266df822 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.cc +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.cc @@ -2,7 +2,10 @@ #include #include +#include #include +#include +#include #include "caspar_mappings.h" #include "kernel_Matrix21_alpha_denominator_or_beta_numerator.h" @@ -369,6 +372,7 @@ void GraphSolver::DoUpdateStep() { void GraphSolver::DoUpdateRFirst() { Zero(solver__r_0_norm2_tot_, solver__r_0_norm2_tot_ + 1); + Zero(solver__r_kp1_norm2_tot_, solver__r_kp1_norm2_tot_ + 1); Matrix21UpdateRFirst(nodes__Matrix21__r_k_, Matrix21_num_, nodes__Matrix21__w_, Matrix21_num_, solver__neg_alpha_, nodes__Matrix21__r_k_, Matrix21_num_, diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.h index 247055a1..6b3f0b1d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_solver_test/solver.h @@ -3,8 +3,7 @@ #include #include -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" #include "solver_params.h" diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.cu index 0b2a5761..3a525387 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.cu @@ -1,11 +1,7 @@ #include -#include -#include - #include "caspar_mappings.h" - -namespace cg = cooperative_groups; +#include "cuda_to_hip.h" // We use shared memory to improve the memory access. // A smaller block size of 32 allows for larger nodetypes. diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.h index 6d656e85..08b042c4 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/caspar_mappings.h @@ -1,6 +1,6 @@ #pragma once -#include +#include "cuda_to_hip.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.cu index 495c7be2..c33a2eab 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_alpha_denominator_or_beta_numerator.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.h index b02b452a..4247df5d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_denominator_or_beta_numerator.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.cu index 20c3096e..83f2f2dd 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_alpha_numerator_denominator.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.h index 94a7d660..b6a13e5b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_alpha_numerator_denominator.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.cu index 5a945d07..a2efd490 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_cyclic_reduction_down.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(64, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.h index ce406fc6..2cb52fd8 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_down.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.cu index b3cca154..2bcd3719 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_cyclic_reduction_solve_two.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(32, 1) ChainACyclicReductionSolveTwoKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.h index 06a5d1c6..7ec47c94 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_solve_two.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.cu index 4528c2a3..dd839d7b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_cyclic_reduction_up.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(32, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.h index 39ef29d7..3147af1e 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_cyclic_reduction_up.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.cu index 79c73bb1..f10a72e5 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_normalize.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.h index 89f4215b..3c133ee6 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_normalize.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.cu index f65466e3..9e043786 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_pred_decrease_times_two.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainAPredDecreaseTimesTwoKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.h index e4dce58f..3aa94f50 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_pred_decrease_times_two.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.cu index 840f1547..23af59fd 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_retract.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.h index ed36ee7e..69f2cbdf 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_retract.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.cu index 8e5a69c0..9c2acfc4 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_start_w.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.h index e64ad145..e2b2b853 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.cu index a6b6817b..c9a00429 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_start_w_contribute.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.h index 31df0106..74a7b12d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_start_w_contribute.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.cu index a0781406..436e8edc 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_tridig_make_eq.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.h index 9052869a..449052fa 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_tridig_make_eq.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.cu index 48d5d026..b7f41bef 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_update_Mp.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.h index 12f1567d..f1d9753a 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_Mp.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.cu index c2116156..dc900ffb 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_update_p.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.h index ffce655a..0a420698 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_p.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.cu index ff725db8..ed16ba53 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_update_r.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.h index c5caa08e..9fe69710 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.cu index e35670ca..c1ede4bf 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_update_r_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.h index 270fdda1..b17dd0d5 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_r_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.cu index 187263ef..3fcb94cc 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_update_step.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.h index 1e4a1968..b109de03 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.cu index 6ce1c156..ad116a77 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainA_update_step_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.h index 461de55f..0385d1ff 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainA_update_step_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.cu index c5e4aa53..cd4445c4 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_alpha_denominator_or_beta_numerator.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.h index 5089b1c7..0ac4db49 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_denominator_or_beta_numerator.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.cu index 4c8b49e2..b9502b30 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_alpha_numerator_denominator.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.h index 613341f5..19dff844 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_alpha_numerator_denominator.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.cu index d1485291..8947c3fe 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_cyclic_reduction_down.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(64, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.h index 8ceb4040..977263fc 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_down.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.cu index aee9c96d..5cd6fe7e 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_cyclic_reduction_solve_two.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(32, 1) ChainBCyclicReductionSolveTwoKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.h index 9fae819f..45685b8d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_solve_two.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.cu index 66441e66..d5c75540 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_cyclic_reduction_up.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(32, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.h index 01c1a58a..7d294b91 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_cyclic_reduction_up.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.cu index 15e36382..e330dc79 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_normalize.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.h index de57b746..4f55d267 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_normalize.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.cu index f2e5ad81..9c905759 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_pred_decrease_times_two.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainBPredDecreaseTimesTwoKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.h index 88b292b1..67d42837 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_pred_decrease_times_two.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.cu index a70477ad..9aed0485 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_retract.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.h index 4b7699ee..16aded79 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_retract.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.cu index b704e6e7..e398255b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_start_w.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.h index 537d1853..6163eb68 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.cu index e1dbea27..5b527170 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_start_w_contribute.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.h index 5ccd0fd1..a7fd62c0 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_start_w_contribute.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.cu index d6d1fb4b..8a566df8 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_tridig_make_eq.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.h index 8872219e..56daa017 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_tridig_make_eq.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.cu index 479a3026..033982da 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_update_Mp.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.h index 13c7935f..21c02603 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_Mp.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.cu index e2a6843d..cdaec3d8 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_update_p.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.h index 3c6125d5..4dd63968 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_p.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.cu index 355656ca..fb60a073 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_update_r.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.h index c8eb9f28..2268a65b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.cu index 9f7c746f..2426e9a5 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_update_r_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.h index 1ff22f75..27bc58a9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_r_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.cu index 9cd0cc24..bd0cac85 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_update_step.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.h index 006779e7..eeb880b1 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.cu index e3f1301d..c332c87b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_ChainB_update_step_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.h index 1036592e..caf242c5 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_ChainB_update_step_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.cu index 369a87ed..f7d98995 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_link_jtjnjtr_direct.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.h index ed6ae6d4..02d71b44 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_jtjnjtr_direct.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.cu index 7495787b..9545daf0 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_link_res_jac.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainALinkResJacKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.h index 28cff54b..b91e80a3 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.cu index df421ac3..cc6e6e35 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_link_res_jac_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainALinkResJacFirstKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.h index b757536c..64422a63 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_res_jac_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.cu index 50df9650..969b30f8 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_link_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.h index 633032eb..35749c52 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_link_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.cu index 4f00ae2b..372cb17d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_prior_jtjnjtr_direct.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.h index 1f456876..f2c87bf4 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_jtjnjtr_direct.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.cu index 7da8cd8d..c38f5fe9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_prior_res_jac.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.h index 5ca63a90..c23d38b9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.cu index ddbab613..b2e6a226 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_prior_res_jac_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.h index 3cdceb88..f678cda1 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_res_jac_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.cu index 6335d83c..90275926 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_a_prior_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.h index f380ace1..10b0b6b9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_a_prior_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.cu index 3b336af2..61df87a9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_link_jtjnjtr_direct.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.h index de1461c2..5721bcce 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_jtjnjtr_direct.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.cu index 4642b781..30281b27 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_link_res_jac.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainBLinkResJacKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.h index d3ca19d4..6355e2b6 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.cu index 22ff48f3..ac1d68cf 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_link_res_jac_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainBLinkResJacFirstKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.h index 748c5f8e..3278e5ab 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_res_jac_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.cu index 5fb16e3b..24aba18a 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_link_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.h index c7986d12..2ba36574 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_link_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.cu index fad4fa17..6b67dae7 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_prior_jtjnjtr_direct.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.h index 34f3b745..16c36b08 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_jtjnjtr_direct.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.cu index 1d01a9ea..d66f18b7 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_prior_res_jac.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.h index 434b6f81..8f7ae36d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.cu index a7df9eb8..244f3fce 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_prior_res_jac_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.h index 47af0a26..84f2cef8 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_res_jac_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.cu index cb476e7f..db6534c9 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_b_prior_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.h index 239ad096..2d39b16d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_b_prior_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.cu index 5836bbfc..e315f870 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_coupling_jtjnjtr_direct.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainCouplingJtjnjtrDirectKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.h index 0f76b031..2369c40f 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_jtjnjtr_direct.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.cu index 44138dfc..a8770378 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_coupling_res_jac.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainCouplingResJacKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.h index 234789c6..857df690 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.cu index 38f5df97..30a89d9c 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_coupling_res_jac_first.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) ChainCouplingResJacFirstKernel( diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.h index 6ab04b67..b72d524d 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_res_jac_first.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.cu b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.cu index ef2a7945..c953cb96 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.cu +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.cu @@ -1,17 +1,10 @@ #include #include -#include -#include -#include -#include -#include - +#include "cuda_to_hip.h" #include "kernel_chain_coupling_score.h" #include "memops.cuh" -namespace cg = cooperative_groups; - namespace caspar { __global__ void __launch_bounds__(1024, 1) diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.h index a073d176..138c5066 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/kernel_chain_coupling_score.h @@ -1,7 +1,6 @@ #pragma once -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" namespace caspar { diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.cc b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.cc index 098befc3..69b3b22b 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.cc +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.cc @@ -2,7 +2,10 @@ #include #include +#include #include +#include +#include #include "caspar_mappings.h" #include "kernel_ChainA_alpha_denominator_or_beta_numerator.h" @@ -683,6 +686,7 @@ void GraphSolver::DoUpdateStep() { void GraphSolver::DoUpdateRFirst() { Zero(solver__r_0_norm2_tot_, solver__r_0_norm2_tot_ + 1); + Zero(solver__r_kp1_norm2_tot_, solver__r_kp1_norm2_tot_ + 1); ChainAUpdateRFirst(nodes__ChainA__r_k_, ChainA_num_, nodes__ChainA__w_, ChainA_num_, solver__neg_alpha_, nodes__ChainA__r_k_, ChainA_num_, solver__r_0_norm2_tot_, diff --git a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.h b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.h index 5a2242d3..e1757944 100644 --- a/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.h +++ b/test/symforce_function_codegen_test_data/symengine/symforce_caspar_tridiagonal_test/solver.h @@ -3,8 +3,7 @@ #include #include -#include - +#include "cuda_to_hip.h" #include "shared_indices.h" #include "solver_params.h"