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

Jump to bottom

Test fix for OSX CI #2124

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Test fix for OSX CI #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7f90cd
SZip is dead. Long live SZip.
xiangyann Aug 19, 2022
3d04e05
Merge branch 'CMU-Perceptual-Computing-Lab:master' into master
xiangyann Sep 22, 2022
d6eaf05
Install caffe from source
xiangyann Sep 22, 2022
0f60c2c
patch osx CI with leveldb disabled.
xiangyann Sep 22, 2022
4669769
Merge branch 'CMU-Perceptual-Computing-Lab:master' into master
xiangyann Oct 17, 2023
ae4b824
Merge branch 'CMU-Perceptual-Computing-Lab:master' into master
xiangyann Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/CI/configure_cmake.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ if [[ $WITH_DEBUG == true ]] ; then
ARGS="$ARGS -DCMAKE_BUILD_TYPE=Debug"
fi

if [[ $CI_OS_NAME == "osx" ]] ; then
ARGS="$ARGS -DUSE_LEVELDB=OFF";
fi

echo "ARGS = ${ARGS}."

cmake .. $ARGS
Expand Down
6 changes: 5 additions & 1 deletion scripts/osx/install_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
#!/bin/bash
brew_packages="openblas snappy leveldb gflags glog szip lmdb hdf5 opencv protobuf boost cmake viennacl"
brew_packages="openblas snappy leveldb gflags glog libaec lmdb hdf5 opencv protobuf boost cmake viennacl"
for pkg in $brew_packages
do
echo "brew install $pkg || brew upgrade $pkg"
brew install "$pkg" || brew upgrade "$pkg"
done

# fix for caffe
brew uninstall --force caffe
brew install --build-from-source caffe

# with Python pycaffe needs dependencies built from source
#brew install --build-from-source --with-python -vd protobuf
#brew install --build-from-source -vd boost boost-python
Expand Down