From c73f54c6af4323084b0d5d3031129d4eee48ebbe Mon Sep 17 00:00:00 2001 From: Michal Shalev Date: Tue, 16 Sep 2025 23:20:14 +0300 Subject: [PATCH 1/4] BUILD: Add configurable CUDA device debug info flag Signed-off-by: Michal Shalev --- meson.build | 4 ++++ meson_options.txt | 1 + 2 files changed, 5 insertions(+) diff --git a/meson.build b/meson.build index adf891c6ed..3ff12895df 100644 --- a/meson.build +++ b/meson.build @@ -100,6 +100,10 @@ if cuda_dep.found() nvcc_flags_link += ['-gencode=arch=compute_80,code=sm_80'] nvcc_flags_link += ['-gencode=arch=compute_90,code=sm_90'] add_project_link_arguments(nvcc_flags_link, language: 'cuda') + + if not get_option('cuda_enable_debug') + add_project_arguments('-dopt=on', language: 'cuda') + endif else warning('CUDA not found. UCX backend will be built without CUDA support, and some plugins will be disabled.') endif diff --git a/meson_options.txt b/meson_options.txt index a316184f8d..190d49d172 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,6 +24,7 @@ option('gds_path', type: 'string', value: '/usr/local/cuda/', description: 'Path option('cudapath_inc', type: 'string', value: '', description: 'Include path for CUDA') option('cudapath_lib', type: 'string', value: '', description: 'Library path for CUDA') option('cudapath_stub', type: 'string', value: '', description: 'Extra Stub path for CUDA') +option('cuda_enable_debug', type: 'boolean', value: false, description: 'Enable CUDA device debug info (-G flag) for performance analysis') option('static_plugins', type: 'string', value: '', description: 'Plugins to be built-in, comma-separated') option('build_docs', type: 'boolean', value: false, description: 'Build Doxygen documentation') option('log_level', type: 'combo', choices: ['trace', 'debug', 'info', 'warning', 'error', 'fatal', 'auto'], value: 'auto', description: 'Log Level (auto: auto-detect based on build type: trace for debug builds, info for release builds)') From 4ad257d2bab3d29d3b373ed749922cd6718ebeec Mon Sep 17 00:00:00 2001 From: Michal Shalev Date: Wed, 17 Sep 2025 11:27:39 +0300 Subject: [PATCH 2/4] PR fixes + CI fix Signed-off-by: Michal Shalev --- meson.build | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 3ff12895df..23c95998c4 100644 --- a/meson.build +++ b/meson.build @@ -101,7 +101,7 @@ if cuda_dep.found() nvcc_flags_link += ['-gencode=arch=compute_90,code=sm_90'] add_project_link_arguments(nvcc_flags_link, language: 'cuda') - if not get_option('cuda_enable_debug') + if not get_option('cuda_debug_enable') add_project_arguments('-dopt=on', language: 'cuda') endif else diff --git a/meson_options.txt b/meson_options.txt index 190d49d172..b36d0453f1 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,7 +24,7 @@ option('gds_path', type: 'string', value: '/usr/local/cuda/', description: 'Path option('cudapath_inc', type: 'string', value: '', description: 'Include path for CUDA') option('cudapath_lib', type: 'string', value: '', description: 'Library path for CUDA') option('cudapath_stub', type: 'string', value: '', description: 'Extra Stub path for CUDA') -option('cuda_enable_debug', type: 'boolean', value: false, description: 'Enable CUDA device debug info (-G flag) for performance analysis') +option('cuda_debug_enable', type: 'boolean', value: false, description: 'Enable CUDA debug mode (disables -dopt=on optimization)') option('static_plugins', type: 'string', value: '', description: 'Plugins to be built-in, comma-separated') option('build_docs', type: 'boolean', value: false, description: 'Build Doxygen documentation') option('log_level', type: 'combo', choices: ['trace', 'debug', 'info', 'warning', 'error', 'fatal', 'auto'], value: 'auto', description: 'Log Level (auto: auto-detect based on build type: trace for debug builds, info for release builds)') From 09e3082ca231b06c1c7152b35922d4388c299379 Mon Sep 17 00:00:00 2001 From: Michal Shalev Date: Wed, 17 Sep 2025 11:42:54 +0300 Subject: [PATCH 3/4] CI fix Signed-off-by: Michal Shalev --- meson.build | 2 +- meson_options.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 23c95998c4..a622ea3707 100644 --- a/meson.build +++ b/meson.build @@ -101,7 +101,7 @@ if cuda_dep.found() nvcc_flags_link += ['-gencode=arch=compute_90,code=sm_90'] add_project_link_arguments(nvcc_flags_link, language: 'cuda') - if not get_option('cuda_debug_enable') + if not get_option('enable_cuda_debug') add_project_arguments('-dopt=on', language: 'cuda') endif else diff --git a/meson_options.txt b/meson_options.txt index b36d0453f1..1f9935d396 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -24,7 +24,7 @@ option('gds_path', type: 'string', value: '/usr/local/cuda/', description: 'Path option('cudapath_inc', type: 'string', value: '', description: 'Include path for CUDA') option('cudapath_lib', type: 'string', value: '', description: 'Library path for CUDA') option('cudapath_stub', type: 'string', value: '', description: 'Extra Stub path for CUDA') -option('cuda_debug_enable', type: 'boolean', value: false, description: 'Enable CUDA debug mode (disables -dopt=on optimization)') +option('enable_cuda_debug', type: 'boolean', value: false, description: 'Enable CUDA debug mode (disables -dopt=on optimization)') option('static_plugins', type: 'string', value: '', description: 'Plugins to be built-in, comma-separated') option('build_docs', type: 'boolean', value: false, description: 'Build Doxygen documentation') option('log_level', type: 'combo', choices: ['trace', 'debug', 'info', 'warning', 'error', 'fatal', 'auto'], value: 'auto', description: 'Log Level (auto: auto-detect based on build type: trace for debug builds, info for release builds)') From c4ab7c64400d1e95ebc3fd676c6bcddaed7279c5 Mon Sep 17 00:00:00 2001 From: Michal Shalev Date: Wed, 17 Sep 2025 13:59:42 +0300 Subject: [PATCH 4/4] CI fix - change ubuntu-latest to ubuntu-24.04 Signed-off-by: Michal Shalev --- .github/workflows/aws_s3_validation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/aws_s3_validation.yml b/.github/workflows/aws_s3_validation.yml index 790572b3b7..fe61b11ad6 100644 --- a/.github/workflows/aws_s3_validation.yml +++ b/.github/workflows/aws_s3_validation.yml @@ -10,7 +10,7 @@ jobs: run_aws_s3_tests: name: Run AWS S3 Tests environment: SWX_AWS - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: AWS_DEFAULT_REGION: eu-central-1 AWS_ACCESS_KEY_ID: ${{ secrets.NIXL_AWS_ACCESS_KEY_ID }}