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

WIP Protobuf C++ Runtime implementation #151

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5793c69
add c++ proto to the requirements
dtracers Jun 7, 2019
f9ce270
added gitignore
dtracers Jun 7, 2019
5b8f4a9
install runtime library
dtracers Jun 7, 2019
eb50101
added more to install command
dtracers Jun 7, 2019
6f47510
remove check
dtracers Jun 7, 2019
a9a6fb5
Merge branch 'master' into c++-proto
dtracers Sep 20, 2019
dcba56b
Merge branch 'master' into c++-proto
dtracers Oct 9, 2019
3dd76ff
Merge branch 'master' into c++-proto
dtracers Oct 18, 2019
8b96597
Merge branch 'master' into c++-proto
dtracers May 2, 2020
2df78f3
Set env vars before installing.
DivvyCr Jul 2, 2020
5e09736
Follow install instructions from cpp installation repo + Only run one…
DivvyCr Jul 2, 2020
f9569f3
Add 'sudo'..
DivvyCr Jul 7, 2020
acb850d
Merge branch 'master' into c++-proto
DivvyCr Jul 7, 2020
911c28e
Update download url, add echoes for easier debug?
DivvyCr Jul 7, 2020
5b7ae42
Update download url AGAIN
DivvyCr Jul 7, 2020
32a33cc
Version match (sorry for the spam)
DivvyCr Jul 7, 2020
35a52ab
Small fix
DivvyCr Jul 7, 2020
d077016
Small fix
DivvyCr Jul 7, 2020
b569fcd
Merge remote-tracking branch 'origin/c++-proto' into c++-proto
DivvyCr Jul 7, 2020
d364202
Small fix
DivvyCr Jul 7, 2020
e59bb4c
Fix
DivvyCr Jul 7, 2020
fbcfa20
Update requirements.txt
dtracers Jul 7, 2020
be507df
Revert boxcars requirement to v0.1.3.
DivvyCr Jul 9, 2020
d096d36
Don't install cpp implementation. (check if boxcars still fails, to b…
DivvyCr Jul 17, 2020
7d7f516
Bring back cpp runtime installation, but also explicitly install boxc…
DivvyCr Jul 17, 2020
e12e940
Try to resolve boxcars version issue, by not specifying a version.
DivvyCr Jul 17, 2020
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
4 changes: 2 additions & 2 deletions .github/workflows/benchmarking.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
benchtest: [short_sample, short_dropshot, full_rumble, oce_rlcs, intensive_oce_rlcs]
benchtest: [short_sample]

steps:
- uses: actions/checkout@v2
- uses: actions/setup-python@v1
with:
python-version: '3.6.10'
python-version: '3.6.11'
architecture: 'x64'

- name: Install/Update pip and wheel.
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ dist/
*ipynb*

!/carball/tests/replays/
*.py___jb_tmp___
.vscode
5 changes: 4 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ cache:
- pip
- directories:
- carball/generated/binaries
- protobuf-2.6.1/src/
- protobuf-2.6.1/
- v2.6.1/

# We only build if it is a pr into master or it is a pr and it is not into master
if:
Expand All @@ -26,6 +27,8 @@ if:
before_install:
- chmod 777 ./_travis/install-protoc.sh
- "./_travis/install-protoc.sh 2.6.1"
- chmod 777 ./_travis/install-protoc-runtime.sh
- "./_travis/install-protoc-runtime.sh 3.6.1"

install:
- pip install -r requirements.txt
Expand Down
26 changes: 26 additions & 0 deletions _travis/install-protoc-runtime.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
#!/usr/bin/env bash
protoc_version=$1

# Environment variables should be set _prior_ to installing the protobuf library.
# https://developers.google.com/protocol-buffers/docs/reference/python-generated#cpp_impl
echo "Setting environment variables."
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=cpp
export PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION=2

# Process used from:
# https://github.com/protocolbuffers/protobuf/tree/master/src
apt-get install autoconf automake libtool curl make g++ unzip
echo "Attempting download from https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protobuf-cpp-${protoc_version}.zip"
wget https://github.com/protocolbuffers/protobuf/releases/download/v${protoc_version}/protobuf-cpp-${protoc_version}.zip
unzip protobuf-cpp-${protoc_version}.zip
cd protobuf-${protoc_version}
./configure
make
make check
echo "INSTALL; UPDATE LIBS."
sudo make install
sudo ldconfig
echo "PROTOBUF VERSION"
./src/protoc --version
echo "DIR"
ls -lh
2 changes: 2 additions & 0 deletions init.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,5 @@ def initialize_project():
if __name__ == "__main__":
print("Initialising project...")
initialize_project()

# --install-option="--cpp_implementation"
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
numpy==1.18.2
protobuf==3.6.1
protobuf==3.6.1 --install-option="--cpp_implementation"
pandas==1.0.3
xlrd==1.1.0
boxcars-py==0.1.3
boxcars-py