Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,22 +49,22 @@ jobs:
cd libuv-v1.38.0
mkdir -p build
cd build
mkdir -p ${{ env.gtest_lib_path }}
mkdir -p ${{ env.libuv_path }}
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.libuv_path }}
msbuild INSTALL.vcxproj
- name: Install googletest
run: |
conda activate py376_build
curl https://codeload.github.com/google/googletest/tar.gz/release-1.10.0 --output `
googletest-release-1.10.0.tar.gz
tar xzvf googletest-release-1.10.0.tar.gz
cd googletest-release-1.10.0
curl -L https://github.com/google/googletest/releases/download/v1.15.2/googletest-1.15.2.tar.gz `
--output googletest-1.15.2.tar.gz
tar xzvf googletest-1.15.2.tar.gz
cd googletest-1.15.2
mkdir -p build
cd build
if (Test-Path -Path ${{ env.gtest_lib_path }}) {
echo "Directory already exists"
} else {
mkdir ${{ env.gtest_lib_path }}
mkdir -p ${{ env.gtest_lib_path }}
}
cmake .. -DCMAKE_INSTALL_PREFIX=${{ env.gtest_lib_path }} -Dgtest_force_shared_crt=ON
msbuild INSTALL.vcxproj
Expand All @@ -76,9 +76,9 @@ jobs:
mkdir -p build
cd build
cmake .. -DBUILD_TEST=ON -Dlibuv_ROOT=${{ env.libuv_path }} `
-DGTEST_LIBRARY=${{ env.gtest_lib_path }}/lib/gtestd.lib `
-DGTEST_LIBRARY=${{ env.gtest_lib_path }}/lib/gtest.lib `
-DGTEST_INCLUDE_DIR=${{ env.gtest_lib_path }}/include `
-DGTEST_MAIN_LIBRARY=${{ env.gtest_lib_path }}/lib/gtest_maind.lib
-DGTEST_MAIN_LIBRARY=${{ env.gtest_lib_path }}/lib/gtest_main.lib
msbuild ALL_BUILD.vcxproj
- name: Test
run: |
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,5 @@ jobs:
DEFAULT_BRANCH: "main"
# disable JSCPD (copy-paste checker)
VALIDATE_JSCPD: false
# disable CPP
VALIDATE_CPP: false
3 changes: 3 additions & 0 deletions gloo/allreduce_bcube.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
#include <cstring>
#include <iomanip>
#include <iostream>
#include <memory>
#include <string>
#include <unordered_map>
#include <vector>

#include "gloo/algorithm.h"
#include "gloo/common/error.h"
Expand Down
19 changes: 19 additions & 0 deletions gloo/test/base_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,25 @@ namespace test {

const char* kDefaultDevice = "localhost";

// Transports that instantiated algorithms can be tested against.
const std::vector<Transport> kTransportsForClassAlgorithms = {
Transport::TCP,
#if GLOO_HAVE_TRANSPORT_TCP_TLS
Transport::TCP_TLS,
#endif
};

// Transports that function algorithms can be tested against.
// This is the new style of calling collectives and must be
// preferred over the instantiated style.
const std::vector<Transport> kTransportsForFunctionAlgorithms = {
Transport::TCP,
#if GLOO_HAVE_TRANSPORT_TCP_TLS
Transport::TCP_TLS,
#endif
Transport::UV,
};

std::shared_ptr<::gloo::transport::Device> createDevice(Transport transport) {
#if GLOO_HAVE_TRANSPORT_TCP
if (transport == Transport::TCP) {
Expand Down
20 changes: 2 additions & 18 deletions gloo/test/base_test.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,24 +65,8 @@ enum Transport {
UV,
};

// Transports that instantiated algorithms can be tested against.
const std::vector<Transport> kTransportsForClassAlgorithms{
Transport::TCP,
#if GLOO_HAVE_TRANSPORT_TCP_TLS
Transport::TCP_TLS,
#endif
};

// Transports that function algorithms can be tested against.
// This is the new style of calling collectives and must be
// preferred over the instantiated style.
const std::vector<Transport> kTransportsForFunctionAlgorithms{
Transport::TCP,
#if GLOO_HAVE_TRANSPORT_TCP_TLS
Transport::TCP_TLS,
#endif
Transport::UV,
};
extern const std::vector<Transport> kTransportsForClassAlgorithms;
extern const std::vector<Transport> kTransportsForFunctionAlgorithms;

std::shared_ptr<::gloo::transport::Device> createDevice(Transport transport);

Expand Down
Loading