Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump to cmake build instead of makefile #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ distinct_id: checkht

comparison: checkht
git submodule update --init --recursive
cd library/simdjson && make clean && cd ../..
git -C library/simdjson clean -xdf .
docker build -f experiments/comparison/Dockerfile -t comparison .
$(eval outputdir:=$(PWD)/results/$(nodename)/comparison)
@echo $(outputdir)
Expand Down
1 change: 1 addition & 0 deletions experiments/comparison/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM gcc:9.1
COPY . /usr/src/
WORKDIR /usr/src/experiments/comparison
RUN apt update && apt install cmake -y
RUN ./build.sh
CMD ["bash", "run.sh"]
11 changes: 10 additions & 1 deletion experiments/comparison/build.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@
#!/bin/bash
set -eux
SCRIPTPATH="$( cd "$(dirname "$0")" ; pwd -P )"
cd $SCRIPTPATH/../../library/simdjson
make -k parsingcompetition allparsingcompetition
mkdir build-benchmark
cd build-benchmark
cmake .. -DCMAKE_BUILD_TYPE=Release
# older cmake (3.13) needs one target at a time
cmake --build . -j $(nproc) --target parsingcompetition
cmake --build . -j $(nproc) --target allparsingcompetition

echo "$0: done building"

6 changes: 3 additions & 3 deletions experiments/comparison/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ cd $SCRIPTPATH/../../library/simdjson
for i in jsonexamples/*.json; do
[ -f "$i" ] || break
shortname=$(basename $i .json).table
./parsingcompetition -t $i > $RESULTSPATH/$shortname
./parsingcompetition $i > $RESULTSPATH/detailed$shortname
./allparsingcompetition -t $i > $RESULTSPATH/all$shortname
build-benchmark/benchmark/parsingcompetition -t $i > $RESULTSPATH/$shortname
build-benchmark/benchmark/parsingcompetition $i > $RESULTSPATH/detailed$shortname
build-benchmark/benchmark/allparsingcompetition -t $i > $RESULTSPATH/all$shortname
echo -n "."
done
echo
2 changes: 1 addition & 1 deletion library/simdjson