From 9c9536be6eafd04d2f0ec9b2c73f4d60eaaa2205 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 13 Aug 2024 13:49:22 -0700 Subject: [PATCH] uncomment all CI, logger-specific visibility control should no longer be necessary --- .github/workflows/pr.yaml | 180 +++++++++++++++++++------------------- cpp/CMakeLists.txt | 12 --- 2 files changed, 90 insertions(+), 102 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index fcbf3c48873..9802b238931 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -13,16 +13,16 @@ jobs: pr-builder: needs: - checks - # - conda-cpp-build - # - conda-cpp-checks - # - conda-cpp-tests - # - conda-python-build - # - conda-python-cudf-tests - # - conda-python-other-tests - # - conda-java-tests + - conda-cpp-build + - conda-cpp-checks + - conda-cpp-tests + - conda-python-build + - conda-python-cudf-tests + - conda-python-other-tests + - conda-java-tests - static-configure - # - conda-notebook-tests - # - docs-build + - conda-notebook-tests + - docs-build - wheel-build-cpp - wheel-build-python - wheel-tests-python @@ -30,7 +30,7 @@ jobs: - wheel-tests-cudf-polars - wheel-build-dask-cudf - wheel-tests-dask-cudf - # - devcontainer + - devcontainer - unit-tests-cudf-pandas - pandas-tests - pandas-tests-diff @@ -41,56 +41,56 @@ jobs: uses: rapidsai/shared-workflows/.github/workflows/checks.yaml@branch-24.10 with: enable_check_generated_files: false - # conda-cpp-build: - # needs: checks - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 - # with: - # build_type: pull-request - # conda-cpp-checks: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10 - # with: - # build_type: pull-request - # enable_check_symbols: true - # conda-cpp-tests: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # conda-python-build: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 - # with: - # build_type: pull-request - # conda-python-cudf-tests: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: "ci/test_python_cudf.sh" - # conda-python-other-tests: - # # Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 - # with: - # build_type: pull-request - # script: "ci/test_python_other.sh" - # conda-java-tests: - # needs: conda-cpp-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/test_java.sh" + conda-cpp-build: + needs: checks + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-build.yaml@branch-24.10 + with: + build_type: pull-request + conda-cpp-checks: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-post-build-checks.yaml@branch-24.10 + with: + build_type: pull-request + enable_check_symbols: true + conda-cpp-tests: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-cpp-tests.yaml@branch-24.10 + with: + build_type: pull-request + conda-python-build: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-build.yaml@branch-24.10 + with: + build_type: pull-request + conda-python-cudf-tests: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + with: + build_type: pull-request + script: "ci/test_python_cudf.sh" + conda-python-other-tests: + # Tests for dask_cudf, custreamz, cudf_kafka are separated for CI parallelism + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/conda-python-tests.yaml@branch-24.10 + with: + build_type: pull-request + script: "ci/test_python_other.sh" + conda-java-tests: + needs: conda-cpp-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/test_java.sh" static-configure: needs: checks secrets: inherit @@ -101,26 +101,26 @@ jobs: # primary static consumers (Spark) are not in conda anyway. container_image: "rapidsai/ci-wheel:latest" run_script: "ci/configure_cpp_static.sh" - # conda-notebook-tests: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/test_notebooks.sh" - # docs-build: - # needs: conda-python-build - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 - # with: - # build_type: pull-request - # node_type: "gpu-v100-latest-1" - # arch: "amd64" - # container_image: "rapidsai/ci-conda:latest" - # run_script: "ci/build_docs.sh" + conda-notebook-tests: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/test_notebooks.sh" + docs-build: + needs: conda-python-build + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/custom-job.yaml@branch-24.10 + with: + build_type: pull-request + node_type: "gpu-v100-latest-1" + arch: "amd64" + container_image: "rapidsai/ci-conda:latest" + run_script: "ci/build_docs.sh" wheel-build-cpp: needs: checks secrets: inherit @@ -181,16 +181,16 @@ jobs: matrix_filter: map(select(.ARCH == "amd64")) | group_by(.CUDA_VER|split(".")|map(tonumber)|.[0]) | map(max_by([(.PY_VER|split(".")|map(tonumber)), (.CUDA_VER|split(".")|map(tonumber))])) build_type: pull-request script: ci/test_wheel_dask_cudf.sh - # devcontainer: - # secrets: inherit - # uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 - # with: - # arch: '["amd64"]' - # cuda: '["12.5"]' - # build_command: | - # sccache -z; - # build-all -DBUILD_BENCHMARKS=ON --verbose; - # sccache -s; + devcontainer: + secrets: inherit + uses: rapidsai/shared-workflows/.github/workflows/build-in-devcontainer.yaml@branch-24.10 + with: + arch: '["amd64"]' + cuda: '["12.5"]' + build_command: | + sccache -z; + build-all -DBUILD_BENCHMARKS=ON --verbose; + sccache -s; unit-tests-cudf-pandas: needs: wheel-build-python secrets: inherit diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index c5fd1283356..eeafc411874 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -695,18 +695,6 @@ set_source_files_properties( src/transform/transform.cpp PROPERTIES COMPILE_DEFINITIONS "_FILE_OFFSET_BITS=64" ) -# We need to hide symbols in the logger TU by default because those symbols include spdlog symbols -# that are compiled in because we use it as a header-only library. This is problematic because other -# libraries that also do the same thing will have their own copies, and they will all be weak -# symbols so which one is used is undefined. Marking these symbols as hidden makes them local and -# ensures that internal calls to spdlog functions correctly use the local copy. -# -# Note that it is unusual to use spdlog as a header-only library, but we do so in order to keep RMM -# as a header-only library. -set_source_files_properties( - src/utilities/logger.cpp PROPERTIES COMPILE_OPTIONS - "-fvisibility=hidden;-fvisibility-inlines-hidden" -) set_property( SOURCE src/io/parquet/writer_impl.cu