Skip to content

Commit

Permalink
fix ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Yihao Sun committed Jul 21, 2023
1 parent 1af93c5 commit 43cf492
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
RUN add-apt-repository ppa:plt/racket
RUN apt-get update && apt-get install -y clang-format clang-tidy clang-tools clang clangd libc++-dev libc++1 libc++abi-dev \
libc++abi1 libclang-dev libclang1 liblldb-dev libomp-dev libomp5 lld lldb \
llvm-dev llvm-runtime llvm python3-clang mcpp cmake racket build-essential openmpi-bin libopenmpi-dev z3 \
llvm-dev llvm-runtime llvm python3-clang mcpp cmake racket build-essential mpich libmpich-dev z3 \
git python3-pip sqlite3 ninja-build valgrind apt-utils libssl-dev vim valgrind apt-utils
RUN raco setup --doc-index --force-user-docs
RUN raco pkg install --batch --deps search-auto binaryio graph rparallel pmap csv-reading
Expand All @@ -17,12 +17,13 @@ ENV OMPI_ALLOW_RUN_AS_ROOT_CONFIRM=1
ENV OMPI_MCA_btl_vader_single_copy_mechanism=none
ENV CC=mpicc
ENV CXX=mpicxx
ENV MPI_BIN_HOME=/usr/bin

COPY . /slog

# build backend
RUN cd /slog/backend ; rm -rf build ; \
cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -DCMAKE_C_COMPILER:FILEPATH=/usr/bin/clang -H/slog/backend -B/slog/backend/build -G Ninja ; \
cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -DCMAKE_BUILD_TYPE:STRING=RelWithDebInfo -H/slog/backend -B/slog/backend/build -G Ninja ; \
cmake --build /slog/backend/build --config Release --target all -j --

WORKDIR /slog
Expand Down
5 changes: 3 additions & 2 deletions runslog
Original file line number Diff line number Diff line change
Expand Up @@ -216,15 +216,16 @@ def run_local(file, out_path, factloc, cores, verbose, slog_root=None, compile_b
if verbose:
print("Running slog executable.")
try:
mpirun_bin_path = f"{os.getenv('MPI_BIN_HOME', '/opt/mpich/bin')}/mpirun"
start = time.time()
if not debug_flag:
cmd = ["/opt/mpich/bin/mpirun", "-n", f"{cores}", backend_slog_bin,
cmd = [mpirun_bin_path, "-n", f"{cores}", backend_slog_bin,
slogc_path, inputloc, outloc]
print(cmd)
out = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
else:
out = subprocess.check_output(
["mpirun", "-n", f"{cores}", "valgrind", "--leak-check=yes", "--show-reachable=yes",
[mpirun_bin_path, "-n", f"{cores}", "valgrind", "--leak-check=yes", "--show-reachable=yes",
backend_slog_bin, slogc_path, outloc, inputloc],
stderr=subprocess.STDOUT)
end = time.time()
Expand Down
2 changes: 1 addition & 1 deletion slog/tests/testcase/stringtest/input/foo.csv
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1 foo
1 "foo"

0 comments on commit 43cf492

Please sign in to comment.