diff --git a/.github/workflows/benchmarking.yml b/.github/workflows/benchmarking.yml index ea8f78f6..b3fb4b78 100644 --- a/.github/workflows/benchmarking.yml +++ b/.github/workflows/benchmarking.yml @@ -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. diff --git a/.gitignore b/.gitignore index 2b4a27e2..e67867fd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,4 +13,5 @@ dist/ *ipynb* !/carball/tests/replays/ +*.py___jb_tmp___ .vscode diff --git a/.travis.yml b/.travis.yml index b004c765..dd80830b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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: @@ -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 diff --git a/_travis/install-protoc-runtime.sh b/_travis/install-protoc-runtime.sh new file mode 100644 index 00000000..267342db --- /dev/null +++ b/_travis/install-protoc-runtime.sh @@ -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 \ No newline at end of file diff --git a/init.py b/init.py index cf8f38ae..c2af0335 100644 --- a/init.py +++ b/init.py @@ -11,3 +11,5 @@ def initialize_project(): if __name__ == "__main__": print("Initialising project...") initialize_project() + +# --install-option="--cpp_implementation" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 6bd58a7f..6d639d2e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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