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.

Sign up for GitHub

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

Hyperscan 5.2.1 integration #849

Merged
merged 9 commits into from
Mar 12, 2020
Merged

Hyperscan 5.2.1 integration #849

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d7763fb
Add Hyperscan 5.2.1 integration to javacpp-presets
SoulDefender Feb 27, 2020
06ea8fc
Add Windows support for Hyperscan integration
SoulDefender Feb 29, 2020
1ab03ac
Fix Hyperscan build on Linux by refreshing yum repos
SoulDefender Mar 3, 2020
eb3e0bf
Merge branch 'master' into hyperscan-integration
SoulDefender Mar 4, 2020
b04d5f3
Change CentOS version from 6 to 7 for Hyperscan build
SoulDefender Mar 4, 2020
124c74a
Uncomment projects for Travis and AppVeyor full builds
SoulDefender Mar 5, 2020
1e6aa78
Fix build files (Travis, Appveyor). Add direct Ragel installation on …
SoulDefender Mar 8, 2020
fa8d402
Merge remote-tracking branch 'upstream/master' into hyperscan-integra…
saudet Mar 12, 2020
3fb8187
Fix formatting, copyright header, and update CHANGELOG.md, README.md,…
saudet Mar 12, 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
Prev Previous commit
Next Next commit
Change CentOS version from 6 to 7 for Hyperscan build
  • Loading branch information
@SoulDefender
SoulDefender committed Mar 4, 2020
commit b04d5f30a6ce6bb1318d5bdb6789bf0a4005df90
4 changes: 2 additions & 2 deletions ci/install-travis.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ if [ "$TRAVIS_OS_NAME" == "osx" ]; then export JAVA_HOME=$(/usr/libexec/java_hom
if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ android ]]; then
CENTOS_VERSION=6
SCL_ENABLE="devtoolset-7 python27 rh-git29"
if [[ "mxnet tensorflow onnx ngraph onnxruntime qt skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
if [[ "mxnet hyperscan tensorflow onnx ngraph onnxruntime qt skia " =~ "$PROJ " ]] || [[ "$OS" =~ android ]]; then
CENTOS_VERSION=7
SCL_ENABLE="devtoolset-7 rh-git218"
fi
Expand All @@ -58,7 +58,7 @@ if [[ "$OS" == "linux-x86" ]] || [[ "$OS" == "linux-x86_64" ]] || [[ "$OS" =~ an
DOCKER_CONTAINER_ID=$(docker ps | grep centos | awk '{print $1}')
echo "Container id is $DOCKER_CONTAINER_ID please wait while updates applied"
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -q -y --disablerepo=cuda install centos-release-scl-rh epel-release"
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum repolist"
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -y repolist"
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -q -y --disablerepo=cuda install rh-java-common-ant $SCL_ENABLE ccache clang gcc-c++ gcc-gfortran java-1.8.0-openjdk-devel ant python python36-devel python36-pip swig git file which wget unzip tar bzip2 gzip xz patch make cmake3 autoconf-archive libtool bison flex perl nasm yasm alsa-lib-devel freeglut-devel gtk2-devel libusb-devel libusb1-devel zlib-devel SDL-devel libva-devel libxkbcommon-devel fontconfig-devel libffi-devel ragel"
docker exec -ti $DOCKER_CONTAINER_ID /bin/bash -xec "yum -y --disablerepo=cuda update"
if [ "$OS" == "linux-x86" ]; then
Expand Down