Skip to content
Open
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
3 changes: 2 additions & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
[codespell]
ignore-words-list = crate, trait, dyn, async
exclude-file = ./benchmark/nixlbench/src/utils/external/cxxopts.hpp
ignore-words-list = crate, trait, dyn
3 changes: 2 additions & 1 deletion .github/workflows/clang-format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ jobs:
- name: Check clang-format on changed lines
run: |
FILE_PATTERN='\.(cpp|h|cc|c|cxx|hpp|cu|cuh)$'
EXCLUDED_PATTERN='benchmark/nixlbench/src/utils/external/'
echo "### Modified C/C++ files:"
FILES=$(git diff --name-only HEAD^1 HEAD | grep -E "$FILE_PATTERN") || true
FILES=$(git diff --name-only HEAD^1 HEAD | grep -E "$FILE_PATTERN" | grep -vE "$EXCLUDED_PATTERN") || true
[ -z "$FILES" ] && echo "(none)" || echo "$FILES"
echo "### clang format errors:"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/copyright-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ for f in $(git ls-files); do

# Skip ignored folders anywhere in path
case "$f" in
.github/*|.ci/*)
.github/*|.ci/*|benchmark/nixlbench/src/utils/external/*)
continue
;;
esac
Expand Down
7 changes: 2 additions & 5 deletions benchmark/nixlbench/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ if cuda_available
endif
endif

# GFlags
gflags_dep = dependency('gflags', required: true)

# OpenMP
openmp_dep = dependency('openmp', required: true)

Expand Down Expand Up @@ -166,7 +163,7 @@ configure_file(
install_dir: get_option('includedir') / 'nixlbench'
)

deps = [gflags_dep, nixl_lib, nixl_build, nixl_serdes, openmp_dep]
deps = [nixl_lib, nixl_build, nixl_serdes, openmp_dep]
args = []
if etcd_available
deps += [etcd_dep]
Expand Down Expand Up @@ -208,7 +205,7 @@ if nvshmem_available
nvcc_args += ['-L' + meson.current_build_dir() + '/src/utils']
nvcc_args += ['-L' + meson.current_build_dir() + '/src/runtime']
nvcc_args += ['-L' + meson.current_build_dir() + '/src/worker']
nvcc_args += ['-lnixl', '-lnixl_build', '-lserdes', '-lgflags', '-lcuda', '-lcudart', '-lnvshmem']
nvcc_args += ['-lnixl', '-lnixl_build', '-lserdes', '-lcuda', '-lcudart', '-lnvshmem']
nvcc_args += args
nvcc_cmd_files = [
meson.current_build_dir() + '/src/utils/libutils.a.p/utils.cpp.o',
Expand Down
7 changes: 1 addition & 6 deletions benchmark/nixlbench/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include <iostream>
#include <nixl.h>
#include <sys/time.h>
#include <gflags/gflags.h>
#include "utils/utils.h"
#include "utils/scope_guard.h"
#include "worker/nixl/nixl_worker.h"
Expand Down Expand Up @@ -182,9 +181,7 @@ static std::unique_ptr<xferBenchWorker> createWorker(int *argc, char ***argv) {
}

int main(int argc, char *argv[]) {
gflags::ParseCommandLineFlags(&argc, &argv, true);

int ret = xferBenchConfig::loadFromFlags();
int ret = xferBenchConfig::parseConfig(argc, argv);
if (0 != ret) {
return EXIT_FAILURE;
}
Expand Down Expand Up @@ -236,7 +233,5 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}

gflags::ShutDownCommandLineFlags();

return worker_ptr->signaled() ? EXIT_FAILURE : EXIT_SUCCESS;
}
Loading