microsoft
/
caffe
зеркало из https://github.com/microsoft/caffe.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность
3 236 коммитов 3 Ветки 11 Теги 51 MiB
Граф коммитов

35 Коммитов

Автор SHA1 Сообщение Дата
Martin Häcker b45afa216d Add commented out helpers for homebrew users 2015-04-02 22:50:55 +02:00
Jonathan L Long 55e5aa2374 add WITH_PYTHON_LAYER build option to include Python layer 
Currently, this will only work when running from pycaffe (but not the
tool binary), due to static linking conflicts with registration.
 2015-02-16 22:47:30 -08:00
Evan Shelhamer 43bae95d7f Back-merge fixes + docs 
and other fixes and documentation updates.
 2015-01-21 15:54:21 -08:00
Jonathan L Long b0f45a9002 pretty the build with the Q variable 
Unset Q (in the environment) to see full commands, or edit in
Makefile.config.
 2014-12-28 17:38:01 -08:00
Evan Shelhamer e8dee350ad compile for compute capability 5.0 2014-12-05 08:12:55 -08:00
Craig Quiter d7da420b4c Sometimes anaconda is installed in root. 
Helps fix #489.
 2014-10-15 21:26:01 -07:00
Jeff Donahue 8944b7addc Reintroduce pkg-config with optional Makefile.config flag. 2014-10-14 21:14:14 -07:00
Evan Shelhamer 77d91242cd add cuDNN to build 2014-09-07 19:25:23 +02:00
Jonathan L Long 49381cc22c use /usr instead of /usr/local for default Python include/lib 
This makes the default settings usable with Travis/Ubuntu Python
 2014-07-18 16:15:02 -07:00
Evan Shelhamer b6d881d1e7 configure Makefile for CPU-only build 2014-07-17 11:57:06 +02:00
Jeff Donahue 9c65fbaa86 Replace CUSTOM_CXX env var to specify non-default C++ compiler. 2014-07-14 13:43:08 -07:00
Jeff Donahue 24bfd03da3 -Override the default compiler by specifying a CXX in 
Makefile.config instead of CUSTOM_CXX, as Travis exports CXX
as the compiler env variable name.
-Change TEST_HDFS -> TEST_HXX_SRCS.
 2014-07-14 02:18:16 -07:00
Evan Shelhamer 18a4e2d1fc customize compiler setting in Makefile.config 
in case of issues with default compilers or exotic platforms.
 2014-07-03 18:38:30 -07:00
yzhuan fae9b13f71 Update Makefile.config.example 
fix some typing error
 2014-06-30 12:09:40 -07:00
Evan Shelhamer e954481f8f Merge pull request #510 from crizCraig/patch-1 
Add comment to Makefile.config.example about DEBUG flag issue in OSX
 2014-06-27 14:15:02 -07:00
Evan Shelhamer 180a75bb96 add latest CUDA arch to fix invalid device function errors 
...on devices of that architecture.
 2014-06-27 08:53:15 -07:00
Craig Quiter e43947a44c Add comment to Makefile.config.example about DEBUG flag issue in OSX per #171. 2014-06-17 00:00:01 -07:00
leelurch 40837161e3 Add comment for how to set the CUDA path when cuda tools are installed by the package manager. 2014-06-15 20:07:04 -05:00
Sergey Karayev b11290a8b5 installation doc update 2014-04-20 13:38:30 -07:00
Evan Shelhamer ed38827284 Give choice of ATLAS, MKL, and OpenBLAS (with option to override paths) 
- configure build for ATLAS, MKL, or OpenBLAS on Linux and OSX
- allow overriding of the include or lib dirs
- replace magic numbers with BLAS names (atlas, mkl, open)

Follow-up from #305 and #325.
 2014-04-15 01:49:08 -06:00
Evan Shelhamer 426f089df4 rename python include config var to match lib 2014-04-15 01:49:08 -06:00
AlOa 8fd9f8cec7 Add possibility to use OpenBlas 2014-04-14 16:12:12 +02:00
Jeff Donahue d09f023ed2 Merge pull request #305 from shelhamer/install-doc-blas-platform 
Document BLAS install, tailor Makefile and Makefile.config to platform
 2014-04-08 20:11:53 -07:00
Evan Shelhamer d60eebcce8 Comment out MATLAB by default in Makefile.config 
Otherwise the Makefile tries to determine the MATLAB SO extension even
if MATLAB doesn't exist, breaking `make`.
 2014-04-08 16:44:54 -07:00
Evan Shelhamer 8fc0e4bbe6 auto-configure linux/osx build differences 
- set cxx as needed (clang++ on os x)
- set stdlib flag for os x 10.9 (CUDA libc++ workaround)
- link ATLAS properly for non-MKL installation whether linux or os x
 2014-04-08 15:45:00 -07:00
Evan Shelhamer 8f1f3d2938 trivial makefile grooming 2014-04-08 15:25:04 -07:00
Jeff Donahue 654d8114ed put TEST_GPUID in Makefile.config 2014-04-02 10:58:49 -07:00
Jonathan L Long c8ec12c5cb add DEBUG option to Makefile/Makefile.config.example 
This allows debugging to be toggled without dirtying the tree.
 2014-03-27 20:15:32 -07:00
Evan Shelhamer f6cbe2c5ce make MKL switch surprise-proof 2014-03-21 13:52:36 -07:00
Evan Shelhamer c028d09ca6 rewrite MKL flag note, polish makefile 
add MKL dirs conditioned on USE_MKL
include libraries before making LD_FLAGS
 2014-03-21 13:52:36 -07:00
Rowland Depp a8c9b66b7f major refactoring allow coexistence of MKL and non-MKL cases 2014-03-21 13:52:36 -07:00
Sergey Karayev 38b21d7553 More comments in Makefile.config.example 2014-02-25 22:59:26 -08:00
Evan Shelhamer 55198262d7 define by := (no need for re-expansion) 2014-02-14 23:28:26 -08:00
Evan Shelhamer f4a0a6fcc2 add CXXFLAGS for libstdc++ on OS X 10.9 2014-02-11 19:55:41 -08:00
Sergey Karayev d20cd5c407 Makefile.config removed in favor of .example file 
with more verbose explanations of paths.
 2014-02-03 02:41:44 -08:00