summaryrefslogtreecommitdiff
path: root/Makefile
AgeCommit message (Collapse)AuthorFilesLines
2017-04-24Fix python support problems caused by building script errors.yangyanzhan1-1/+1
Summary: When trying to build caffe2 with python provided by homebrew, I find out there are some errors in the building scripts. The "get_python_cmake_flags.py" script is supposed to find out the correct python library and header file locations. However, due to these errors, this script does not function correctly. After building, caffe2 is linked against the default python library provided by Apple which causes a crash when trying to validate whether or not the installation is successful: ```shell python -c 'from caffe2.python import core' 2>/dev/null && echo "Success" || echo "Failure" ``` The fix is as simple as follows: - Add "shell" so that command substitution could work under Makefile. - Add blank spaces between -D options so that they are treated as options not makefile targets. - Print the "flags" variable without the newline character so that they could be utilized by command substitution correctly. Closes https://github.com/caffe2/caffe2/pull/391 Differential Revision: D4943212 Pulled By: Yangqing fbshipit-source-id: 04d3595fa2d89fe57aed5b6a7a91a95114a82a1b
2017-04-20Fix parallel build support in makefileChris Hiszpanski1-1/+1
Summary: Top-level makefile had `make` hardcoded, resulting in slow build and the following message when following installation instructions: warning: jobserver unavailable: using -j1. Add `+' to parent make rule. Replacing this recursive make command with the variable MAKE fixes the issue. Closes https://github.com/caffe2/caffe2/pull/324 Differential Revision: D4920978 Pulled By: Yangqing fbshipit-source-id: 1e75ab41786e52d1b7abcc2c46ad1088880d8c1d
2017-02-21Fix some python version issues with cmakeBram Wasti1-1/+1
Summary: This script will attempt to determine files that will be useful for building with the correct python version. Currently on macOS with various python installations CMake fails to determine the correct location of python libraries. Closes https://github.com/caffe2/caffe2/pull/163 Reviewed By: Yangqing Differential Revision: D4594954 Pulled By: bwasti fbshipit-source-id: c2b750ee9608a02fad4ce2f2293f5fa54dc7011c
2017-02-16Added local build and apple fix for generating .so filesBram Wasti1-9/+9
Summary: Closes https://github.com/caffe2/caffe2/pull/147 Reviewed By: bwasti Differential Revision: D4564024 Pulled By: JoelMarcey fbshipit-source-id: 526a5ab700f9356a3c93a6c64dc38e44a173559c
2017-01-04goodbye old breweryYangqing Jia1-7/+7
2017-01-04Migrate brewtool stuff into brewtool/ and update makefile to use cmakeBram Wasti1-4/+4
2016-08-02more build updates:Yangqing Jia1-1/+1
(1) nccl submodule, cnmem submodule (2) mpi ops fallback test (3) a bit more blob interface (4) fixed tests (5) caffe2.python.io -> caffe2.python.dataio to avoid name conflicts (6) In the build system autogen __init__.py instead of having manual rules just to copy over an empty __init__.py.
2016-03-08move a bunch of thingsYangqing Jia1-2/+2
2016-01-05make androidYangqing Jia1-1/+4
2015-11-27move to the new build scriptsYangqing Jia1-6/+3
2015-06-25A clean init for Caffe2, removing my earlier hackyYangqing Jia1-0/+21
commits.