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

Fixed broken URLs for dependencies #196

Open
wants to merge 4 commits 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
15 changes: 5 additions & 10 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,7 @@ ExternalProject_Add(libbz2
# unordered containers.
ExternalProject_Add(boost
PREFIX ${GraphLab_SOURCE_DIR}/deps/boost
URL "http://tcpdiag.dl.sourceforge.net/project/boost/boost/1.53.0/boost_1_53_0.tar.gz"
URL_MD5 57a9e2047c0f511c4dfcf00eb5eb2fbb
URL "http://pilotfiber.dl.sourceforge.net/project/boost/boost/1.53.0/boost_1_53_0.tar.gz"
BUILD_IN_SOURCE 1
CONFIGURE_COMMAND
./bootstrap.sh
Expand Down Expand Up @@ -238,8 +237,7 @@ if(NOT NO_TCMALLOC)
PREFIX ${GraphLab_SOURCE_DIR}/deps/tcmalloc
# Some users can't access domain googlecode.com ,This is a spare URL
# URL http://sourceforge.jp/projects/sfnet_gperftools.mirror/downloads/gperftools-2.0.tar.gz
URL http://gperftools.googlecode.com/files/gperftools-2.0.tar.gz
URL_MD5 13f6e8961bc6a26749783137995786b6
URL "https://github.com/gperftools/gperftools/archive/gperftools-2.0.tar.gz"
PATCH_COMMAND patch -N -p0 -i ${GraphLab_SOURCE_DIR}/patches/tcmalloc.patch || true
CONFIGURE_COMMAND <SOURCE_DIR>/configure --enable-frame-pointers --prefix=<INSTALL_DIR> ${tcmalloc_shared}
INSTALL_DIR ${GraphLab_SOURCE_DIR}/deps/local)
Expand Down Expand Up @@ -310,8 +308,7 @@ endif()
# OpenCV =================================================================
ExternalProject_Add(opencv
PREFIX ${GraphLab_SOURCE_DIR}/deps/opencv
URL http://sourceforge.net/projects/opencvlibrary/files/opencv-unix/2.4.9/opencv-2.4.9.zip/download
# URL_MD5 010b63a2542c4ec4918c8cb431c00356
URL "https://github.com/opencv/opencv/archive/2.4.9.tar.gz"
PATCH_COMMAND patch -N -p0 cmake/OpenCVModule.cmake -i ${GraphLab_SOURCE_DIR}/patches/opencv_apple_rpath.patch || true
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
-DBUILD_TESTS=OFF -DBUILD_PERF_TESTS=OFF -DBUILD_PACKAGE=OFF -DBUILD_EXAMPLES=OFF -DOPENCV_BUILD_3RDPARTY_LIBS=ON -DBUILD_SHARED_LIBS=ON -DBUILD_DOCS=OFF -DBUILD_JPEG=ON -DCMAKE_INCLUDE_PATH=${GraphLab_SOURCE_DIR}/deps/local/include -DWITH_CUBLAS=OFF -DWITH_1394=OFF -DWITH_AVFOUNDATION=OFF -DWITH_CUDA=OFF -DWITH_CUFFT=OFF -DWITH_FFMPEG=OFF -DWITH_GSTREAMER=OFF -DWITH_GTK=OFF -DWITH_QUICKTIME=OFF -DWITH_VIDEOINPUT=OFF -DWITH_XIMEA=OFF -DWITH_XINE=OFF -DWITH_V4L=OFF -DWITH_UNICAP=OFF -DWITH_QT=OFF -DWITH_JASPER=NO -DWITH_TIFF=NO -DWITH_OPENCL=OFF -DCMAKE_LIBRARY_PATH=${GraphLab_SOURCE_DIR}/deps/local/lib
Expand Down Expand Up @@ -347,16 +344,14 @@ endmacro(requires_opencv)
if (APPLE)
ExternalProject_Add(libevent
PREFIX ${GraphLab_SOURCE_DIR}/deps/event
URL http://iweb.dl.sourceforge.net/project/levent/libevent/libevent-2.0/libevent-2.0.18-stable.tar.gz
URL_MD5 aa1ce9bc0dee7b8084f6855765f2c86a
URL https://github.com/downloads/libevent/libevent/libevent-2.0.18-stable.tar.gz
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-openssl --enable-shared=no
INSTALL_DIR ${GraphLab_SOURCE_DIR}/deps/local
)
else()
ExternalProject_Add(libevent
PREFIX ${GraphLab_SOURCE_DIR}/deps/event
URL http://iweb.dl.sourceforge.net/project/levent/libevent/libevent-2.0/libevent-2.0.18-stable.tar.gz
URL_MD5 aa1ce9bc0dee7b8084f6855765f2c86a
URL https://github.com/downloads/libevent/libevent/libevent-2.0.18-stable.tar.gz
CONFIGURE_COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-openssl --enable-shared=no
INSTALL_DIR ${GraphLab_SOURCE_DIR}/deps/local
INSTALL_COMMAND prefix=<INSTALL_DIR>/ make install && ${GraphLab_SOURCE_DIR}/patches/libevent_clean_and_remap.sh <INSTALL_DIR>/lib
Expand Down
2 changes: 1 addition & 1 deletion src/graphlab/parallel/fiber_control.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ namespace graphlab {
class fiber_control {
public:

typedef fixed_dense_bitset<64> affinity_type;
typedef fixed_dense_bitset<128> affinity_type;
static affinity_type all_affinity();

struct fiber {
Expand Down