1562 Commits

Author SHA1 Message Date
b31708fb6e Added summary to end of CMake configuration 2017-01-04 16:44:55 -08:00
347e17600f Added option BUILD_PYTHON 2017-01-04 16:44:06 -08:00
3d1bda1f3a cmake: make python dependencies separate from the C++ dependencies 2017-01-04 16:34:56 -08:00
610df2059e Rephrase warning for missing dependency 2017-01-04 15:48:19 -08:00
249e1857e2 Reset and warn when any options are not satisfied 2017-01-04 15:46:43 -08:00
41e03c9c38 cmake file fixes 2017-01-04 14:52:15 -08:00
3e4b24447b Add a missing if opencv found check 2017-01-04 14:09:44 -08:00
dc274f9d74 Merge branch 'cmake' of https://github.com/caffe2/caffe2 into cmake 2017-01-04 15:08:33 -05:00
c52e744cba Merge branch 'master' into cmake 2017-01-04 12:06:39 -08:00
ae62e15f87 Added MPI operators to cmake 2017-01-04 15:06:20 -05:00
7ea9f9e0ee Updated naming convention of Caffe2_LINK* 2017-01-04 12:03:27 -08:00
358d72aa29 Merge pull request #72 from bwasti/master
Merging updates to the build system into main repo
2017-01-04 10:51:36 -08:00
d88d706446 Removed protobuf from third_party 2017-01-04 10:46:00 -08:00
1395c1701e Revert relabeled 'build' directory for protobuf compilation 2017-01-04 10:02:43 -08:00
cc8b6bf715 USE_OPENMP option added
Factor out omp pragma parallel for into a central macro
2017-01-04 12:44:47 -05:00
c226211b87 Merge pull request #7 from caffe2/cmake
Cmake
2017-01-04 00:53:08 -08:00
4d53c632e0 Remove unnecessary cuda flags.
-Xcompiler -std=c++11 is not needed, otherwise gcc produces warnings.
2017-01-04 00:17:35 -08:00
69c09e1c48 BLAS option: Atlas->ATLAS, and added an else() message guard. 2017-01-03 23:37:07 -08:00
6c124c6f49 Allow glog and gflags to be optionally used.
If USE_GLOG and USE_GFLAGS are set to off, or if the system does not
have glog and gflags installed, caffe2 will fall back to a non-glog
and non-gflags installation. This would be helpful for e.g. mobile
builds.
2017-01-03 23:16:50 -08:00
324ef09e01 fix typo 2017-01-03 23:16:36 -08:00
6bf2e156d4 cmake cuda: add libcuda.so find paths, and produce error if it is not found. 2017-01-03 23:14:07 -08:00
ed5b349cd9 Merge t push
branch 'master' of github.com:bwasti/caffe2
2017-01-03 15:27:01 -08:00
eab5cef032 Removed redundant fpic invocation 2017-01-03 15:26:52 -08:00
4ab0351647 Merge pull request #6 from caffe2/cmake
Cmake
2017-01-03 15:19:58 -08:00
737f507786 Fix all instances of 'build' folder being used to prevent errors on make 2017-01-03 14:30:13 -08:00
4698062fcc use different name for build folder (conflicts with build file) 2017-01-03 14:27:08 -08:00
0ce23319c2 Change default blas to Eigen 2017-01-03 13:57:26 -08:00
1aa473638d Added a search path to find OpenBLAS for convenience (homebrew install) 2016-12-29 16:15:25 -05:00
3dbcae9ef0 Fix typo breaking NumPy includes 2016-12-29 13:51:26 -05:00
c2c58480ab added google/benchmark and tidied up Cuda build 2016-12-27 08:49:41 -08:00
4ad367a6fa Merge branch 'master' into cmake 2016-12-22 17:35:29 -08:00
ed2994a385 Add c++11 support to nvcc 2016-12-22 13:43:23 -08:00
fc74eae082 fix build for older versions of CUDA 2016-12-22 13:16:41 -08:00
2da1b44b7f pass std=c++11 directly to nvcc 2016-12-22 11:32:23 -08:00
a14d2b5817 turn off cuda propogate host flags 2016-12-21 18:20:03 -08:00
1c8185ce52 Merge branch 'osx-build' into cmake 2016-12-21 14:30:24 -08:00
4c22d3769b maybe fix cmake file 2016-12-21 14:23:15 -08:00
99e97a4b7a Correction to paths to find cuDNN 2016-12-16 16:03:23 -05:00
dac78727fb Add missing file 2016-12-16 08:00:47 -05:00
03c9d54fd0 Support openCV 2 2016-12-14 14:59:59 -05:00
a46f0fb3cb Merge branch 'cmake' of https://github.com/slayton58/caffe2 into cmake 2016-12-14 11:00:17 -05:00
788f715a6e third_party protobuf support
Fix python lib missed proto dep
2016-12-14 10:54:15 -05:00
df12f431e0 Removing extraneous cmake files
Leftover from Caffe cmake build system
2016-12-13 09:29:01 -05:00
d7eeebc269 Refactored CUDA detection a bit
Refactoring, minor fixes
2016-12-13 09:29:01 -05:00
d74bd7ee55 Add CUDA NVRTC cases 2016-12-13 09:29:01 -05:00
fbbb87cd46 Enhancements
Add BLAS chooser
Move cuDNN detection from Cuda -> FindCuDNN
Refactor main C2 libs, should enable no-GPU build (untested)
2016-12-13 09:29:01 -05:00
5e699ce6c2 CUDA fixes
Fix NCCL build
move CUDA dep into Dependencies file
2016-12-13 09:29:01 -05:00
b9599c7464 Compiling entire project
Can run CIFAR10 Python example!
2016-12-13 09:29:01 -05:00
e9f1222408 Compiling most of the project
Now compiles all CPU + GPU code, tests + binaries with deps
2016-12-13 09:29:01 -05:00
c05ff206b6 Build binaries 2016-12-13 09:29:01 -05:00