From d62775d5d7b2594ce2de07c60b3e0e57c6ce2ade Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Mar 2023 11:21:06 -0700 Subject: [PATCH 1/4] Include gtest in build environment. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + dependencies.yaml | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index ef92a9ad80f..51bf863de74 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -30,6 +30,7 @@ dependencies: - fmt>=9.1.0,<10 - fsspec>=0.6.0 - gcc_linux-64=11.* +- gtest==1.10.0.* - hypothesis - ipython - libarrow==10.0.1.* diff --git a/dependencies.yaml b/dependencies.yaml index e3fe3bbda0d..6d6bdaceff1 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -212,11 +212,12 @@ dependencies: - output_types: conda packages: - fmt>=9.1.0,<10 - - librdkafka=1.7.0 - - spdlog>=1.11.0,<1.12 + - gtest==1.10.0.* # Hard pin the patch version used during the build. This must be kept # in sync with the version pinned in get_arrow.cmake. - libarrow==10.0.1.* + - librdkafka=1.7.0 + - spdlog>=1.11.0,<1.12 build_wheels: common: - output_types: pyproject From 97947c5a9958153230fbed639c2df4ce7d9f3316 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Mar 2023 11:23:24 -0700 Subject: [PATCH 2/4] Also include in meta.yaml. --- conda/recipes/libcudf/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index b31ff37d23b..a72d95532a5 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -51,6 +51,7 @@ requirements: - librdkafka {{ librdkafka_version }} - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} + - gtest==1.10.0.* outputs: - name: libcudf From bbd6c9b8c438a5952c99a2c400c4d51435c08b34 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Mar 2023 11:37:01 -0700 Subject: [PATCH 3/4] Also gmock and remove from libcudf-tests requirements, now required for libcudf itself and transitively passed to tests. --- conda/environments/all_cuda-118_arch-x86_64.yaml | 1 + conda/recipes/libcudf/meta.yaml | 5 ++--- dependencies.yaml | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/conda/environments/all_cuda-118_arch-x86_64.yaml b/conda/environments/all_cuda-118_arch-x86_64.yaml index 51bf863de74..b71101e7e3b 100644 --- a/conda/environments/all_cuda-118_arch-x86_64.yaml +++ b/conda/environments/all_cuda-118_arch-x86_64.yaml @@ -30,6 +30,7 @@ dependencies: - fmt>=9.1.0,<10 - fsspec>=0.6.0 - gcc_linux-64=11.* +- gmock==1.10.0.* - gtest==1.10.0.* - hypothesis - ipython diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index a72d95532a5..f21dc57ad35 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -51,7 +51,8 @@ requirements: - librdkafka {{ librdkafka_version }} - fmt {{ fmt_version }} - spdlog {{ spdlog_version }} - - gtest==1.10.0.* + - gtest {{ gtest_version }} + - gmock {{ gtest_version }} outputs: - name: libcudf @@ -380,8 +381,6 @@ outputs: - {{ pin_subpackage('libcudf', exact=True) }} - {{ pin_subpackage('libcudf_kafka', exact=True) }} - cudatoolkit {{ cuda_spec }} - - gtest {{ gtest_version }} - - gmock {{ gtest_version }} about: home: https://rapids.ai/ license: Apache-2.0 diff --git a/dependencies.yaml b/dependencies.yaml index 6d6bdaceff1..46f9eba9c0d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -213,6 +213,7 @@ dependencies: packages: - fmt>=9.1.0,<10 - gtest==1.10.0.* + - gmock==1.10.0.* # Hard pin the patch version used during the build. This must be kept # in sync with the version pinned in get_arrow.cmake. - libarrow==10.0.1.* From bb410f2f527cad73d7893200142059f10af94186 Mon Sep 17 00:00:00 2001 From: Vyas Ramasubramani Date: Thu, 16 Mar 2023 13:37:36 -0700 Subject: [PATCH 4/4] Include gtest and gmock as run as well as build deps. --- conda/recipes/libcudf/meta.yaml | 2 ++ dependencies.yaml | 9 +++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/conda/recipes/libcudf/meta.yaml b/conda/recipes/libcudf/meta.yaml index f21dc57ad35..6aea6936db1 100644 --- a/conda/recipes/libcudf/meta.yaml +++ b/conda/recipes/libcudf/meta.yaml @@ -73,6 +73,8 @@ outputs: - librmm ={{ minor_version }} - libarrow {{ libarrow_version }} - dlpack {{ dlpack_version }} + - gtest {{ gtest_version }} + - gmock {{ gtest_version }} test: commands: - test -f $PREFIX/lib/libcudf.so diff --git a/dependencies.yaml b/dependencies.yaml index 46f9eba9c0d..12a6d1b370e 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -212,8 +212,8 @@ dependencies: - output_types: conda packages: - fmt>=9.1.0,<10 - - gtest==1.10.0.* - - gmock==1.10.0.* + - >est gtest==1.10.0.* + - &gmock gmock==1.10.0.* # Hard pin the patch version used during the build. This must be kept # in sync with the version pinned in get_arrow.cmake. - libarrow==10.0.1.* @@ -407,6 +407,11 @@ dependencies: - *cudf - cudf_kafka==23.4.* test_cpp: + common: + - output_types: conda + packages: + - *gtest + - *gmock specific: - output_types: conda matrices: