Skip to content

Fix pyCaffe installation on Cmake for MacOS #4314

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

Closed
wants to merge 328 commits into from
Closed

Fix pyCaffe installation on Cmake for MacOS #4314

Changes from 1 commit
Commits
Show all changes
328 commits
Select commit Hold shift + click to select a range
4024b82
[TravisCI] - build protobuf3 GA
lukeyeager Aug 29, 2016
96838cf
Merge pull request #4655 from lukeyeager/bvlc/protobuf3-build-fix
shelhamer Aug 29, 2016
ddafc9b
Merge pull request #4645 from ClimbsRocks/patch-1
jeffdonahue Aug 29, 2016
d1dc92e
Merge pull request #4646 from ClimbsRocks/patch-2
jeffdonahue Aug 29, 2016
b2982c7
Merge pull request #4647 from ClimbsRocks/patch-3
jeffdonahue Aug 29, 2016
b9c3c06
cmake: fix usage of INCLUDE_DIR/INCLUDE_DIRS in Dependencies.cmake
intelfx Aug 14, 2016
a59e647
cmake/Templates: properly spell OpenCV CMake config file name
intelfx Aug 15, 2016
ba189d9
cmake: refactor deps detection, specify all dependencies in the expor…
intelfx Aug 19, 2016
6200b91
net.cpp: do not include test/test_caffe_main.hpp
intelfx Aug 19, 2016
f1b9da5
cmake: add option to link with OpenMP
intelfx Aug 14, 2016
6ed799c
cmake/Templates: remove duplicated #cmakedefines from caffe_config.h.in
intelfx Aug 24, 2016
9bc83e3
fix layerSetUp of scale_layer to not add bias blob when already present
bwilbertz Aug 12, 2016
cdcf2e0
Benchmarking should not impact perf until timer is read
cypof Sep 9, 2016
50b5697
Avoids missing return values during build.
cypof Sep 9, 2016
048530a
Merge pull request #4702 from cypof/timer_sync_on_read
shelhamer Sep 9, 2016
04f9a77
[docs] clarify handling of bias and scaling by BiasLayer, ScaleLayer
shelhamer Aug 28, 2016
d195e60
[docs] note CUDA 8 requirement for Ubuntu 16.04
shelhamer Sep 10, 2016
7f8f9e1
Merge pull request #4705 from shelhamer/ubuntu-cuda-version
shelhamer Sep 10, 2016
3b6fd1d
[docs] identify batch norm layer blobs
shelhamer Aug 28, 2016
c8f446f
batch norm: hide statistics from solver, simplifying layer definition
shelhamer Aug 30, 2016
a8ec123
batch norm: auto-upgrade old layer definitions w/ param messages
shelhamer Sep 9, 2016
fc8f3eb
fix comments in matlab classification demo
kashefy Sep 13, 2016
eee3be1
Fixed typos in examples/cpp_classification/readme
mlloreda Sep 15, 2016
80f4410
Merge pull request #4728 from mlloreda/patch-1
shelhamer Sep 15, 2016
25422de
Merge pull request #4704 from shelhamer/groom-batch-norm
shelhamer Sep 16, 2016
2f55f42
matcaffe: allow destruction of individual networks and solvers
Jun 29, 2015
d208b71
Merge pull request #4600 from bwilbertz/fix_scale_layer
jeffdonahue Sep 20, 2016
f96ccea
[TravisCI] google/protobuf renamed the 3.0 branch
lukeyeager Sep 23, 2016
f40cf46
Merge pull request #4769 from lukeyeager/bvlc/travis-protobuf3-url
shelhamer Sep 24, 2016
79a8c52
Ignore Visual Studio Code files.
kyu-sz Sep 21, 2016
2c34393
Merge pull request #4779 from shelhamer/ignore-visualstudio
shelhamer Sep 27, 2016
ce6ac83
slightly relax batch norm check
bwilbertz Sep 29, 2016
a7f950b
Merge pull request #4785 from bwilbertz/slightly_relax_batch_norm_check
shelhamer Sep 30, 2016
08ca703
NV changed path to cudnn
cypof Oct 1, 2016
a2179bd
Merge pull request #4793 from cypof/cudnn_path
shelhamer Oct 4, 2016
c97a964
fix typo in pascal_multilabel_datalayers.py
wk910930 Oct 5, 2016
cdd2d0e
Fix: docs/yum_install.md glog broken link
Shamanoid Oct 5, 2016
a2f9e9b
Merge pull request #4812 from wk910930/fix-typo
shelhamer Oct 5, 2016
4ba654f
Merge pull request #4813 from Shamanoid/patch-1
shelhamer Oct 5, 2016
553a645
pytest fix: Files created with NamedTemporary files cannot be opened …
willyd Oct 14, 2016
95a436c
Fix: made load_hd5 check blob dims by default.
BlGene Aug 25, 2016
197d11a
sigmoid cross-entropy loss: add GPU forward for full GPU mode
shelhamer Oct 27, 2016
6491504
Merge pull request #4908 from shelhamer/sigce-gpu
shelhamer Oct 27, 2016
f59dc97
add the missing star in comment
nihui Nov 1, 2016
0d20df5
corrected typo in accuracy_layer.hpp: MaxTopBlos -> MaxTopBlobs
karas84 Nov 1, 2016
74f1fc2
Merge pull request #4937 from nihui/patch-1
jeffdonahue Nov 1, 2016
efe1732
Merge pull request #4941 from karas84/caffe-pr
jeffdonahue Nov 1, 2016
3b443ea
Add Github issue template to curb misuse.
williford Oct 28, 2016
29cdee7
Merge pull request #4914 from williford/issue_template
shelhamer Nov 3, 2016
20feab5
Put quotes around titles in YAML front matter.
williford Nov 11, 2016
eb4ba30
Merge pull request #4971 from williford/docs-installation-add-quotes
shelhamer Nov 12, 2016
aaf7b6b
support solver resumes in parse_log.py
davidbrai Nov 14, 2016
c6ab965
sigmoid cross-entropy loss: ignore selected targets by `ignore_label`
shelhamer Nov 15, 2016
6486a7b
docs: Guillaume Dumont is the Windows maintainer
shelhamer Nov 16, 2016
abcb973
docs: include AWS AMI pointer
shelhamer Nov 16, 2016
4a158a8
Merge pull request #4993 from shelhamer/bitfusion-ami
shelhamer Nov 16, 2016
3d62e3c
sigmoid cross-entropy loss: normalize loss by different schemes
shelhamer Nov 17, 2016
28c135c
Merge pull request #4986 from shelhamer/sigce-ignore
shelhamer Nov 17, 2016
2cf9dd3
Add missing spaces besides equal signs in batch_norm_layer.cpp
chenzeyuczy Nov 18, 2016
32c2ce6
Merge pull request #4979 from davidbrai/allow-parse_log-to-skip-lines
shelhamer Nov 18, 2016
473f143
Merge pull request #4703 from cypof/avoid_missing_returns
shelhamer Nov 19, 2016
e52451d
solver: check and set type to reconcile class and proto
shelhamer Nov 21, 2016
48e73c7
Checks inside Xcode for latest OSX SDK (#4840)
Zylphrex Nov 21, 2016
db6cf0a
Fix Python net drawing script
ngaloppo Nov 21, 2016
a60c4a4
Merge pull request #4998 from chenzeyuczy/master
jeffdonahue Nov 22, 2016
a6c6533
Merge pull request #5009 from shelhamer/solver-type-check
shelhamer Nov 22, 2016
2e59864
fix error link
kingofctrl Nov 24, 2016
b644a87
Revert "solver: check and set type to reconcile class and proto"
shelhamer Nov 25, 2016
db66432
fix many typos by using codespell
cdluminate Nov 27, 2016
e6b079d
Merge pull request #5035 from CDLuminate/fix-spelling
shelhamer Nov 27, 2016
fa7fda7
Make lint happy (> 80 characters)
cdluminate Nov 28, 2016
cd681ec
Add the missing period
cdluminate Nov 28, 2016
24d2f67
Merge pull request #5038 from CDLuminate/fix-spelling
jeffdonahue Nov 28, 2016
8cd5c3d
Add Pascal to all cuda architectures
Queuecumber Dec 2, 2016
5a201dd
Merge pull request #5057 from Queuecumber/cuda-pascal-cmake
shelhamer Dec 2, 2016
de3a12f
fix wrongly used marker hash
younghwanoh Dec 7, 2016
57a5bbd
check leveldb iterator status for snappy format.
Dec 16, 2016
b55fe84
docs: add debian installation guide
cdluminate Dec 21, 2016
2fac0d6
Use mkl_malloc when use mkl
tsocha Dec 8, 2016
775f5b0
Fixed a typo
yrevar Dec 22, 2016
3edfd7e
Merge pull request #5112 from yrevar/patch-1
jeffdonahue Dec 22, 2016
5693f31
Join path using "os.path.join" instead of "+"
yrevar Dec 23, 2016
1fd8bd0
Typos in test_inner_product_layer.cpp
ftokarev Dec 30, 2016
f731bc4
Merge pull request #5139 from ftokarev/patches
jeffdonahue Dec 30, 2016
4f0eb52
Fix parse_log.py and parse_log.sh for negative time duration if datet…
xiaojiedeng Dec 31, 2016
bae0607
Overhaul layer catalogue documentation.
williford Jan 1, 2017
fb52c7c
Add Debian codenames and make link.
williford Dec 21, 2016
5c437b1
docs: update debian installation guide. Thanks to @lukeyeager for com…
cdluminate Jan 4, 2017
369a1f4
docs: add some tables to debian install guide and misc update
cdluminate Jan 5, 2017
2317fa1
Logging from python, e.g. for lower log level on multi-GPU workers
cypof Nov 22, 2016
3ba2054
Switched multi-GPU to NCCL
cypof Jan 6, 2017
e21b420
Python Multi-GPU
cypof Nov 23, 2016
0d27efc
Python layers should build on multiprocess & solver_cnt; enable with …
mglaeser Dec 22, 2016
5f28eb1
Using default from proto for prefetch
cypof Jan 4, 2017
365ac88
Merge pull request #4338 from raffienficiaud/master
shelhamer Jan 7, 2017
8e63bb6
minor typo
stoneyang Jan 12, 2017
91c15e8
Python 2/3 compatible download_model_binary.py
willyd Jan 13, 2017
8314363
Merge pull request #5111 from CDLuminate/add-debian-install-guide
shelhamer Jan 13, 2017
0a91794
Merge pull request #5075 from tsocha/master
cypof Jan 14, 2017
a19357a
fixing upgrade_proto for BatchNorm layer: be more conservative leave …
Jan 15, 2017
536851c
Merge pull request #4563 from cypof/nccl
shelhamer Jan 17, 2017
8065c18
Merge pull request #5181 from willyd/download-model-py3
shelhamer Jan 17, 2017
6cbc72a
Merge pull request #5148 from caffe-help/caffe-docs-PR1
shelhamer Jan 18, 2017
ceb25c8
Fix various documentation typos (#4172)
abrowne2 Jan 18, 2017
510249b
Merge pull request #5176 from stoneyang/minor
shelhamer Jan 18, 2017
85e6b67
Merge pull request #5142 from lvchaxj/master
shelhamer Jan 18, 2017
9a980fd
Merge pull request #5121 from yrevar/patch-2
shelhamer Jan 18, 2017
63ca2f9
Merge pull request #5098 from yaronli/master
shelhamer Jan 18, 2017
381c022
Merge pull request #5025 from hmybmny/master
shelhamer Jan 18, 2017
e744056
remove redundant operations in Crop layer (#5138)
xmyqsh Jan 18, 2017
0c8bc25
Merge pull request #4842 from willyd/pytest-fix
shelhamer Jan 18, 2017
9b9f6d0
[build] remove trailing backslash on comment
longjon Jan 19, 2017
ff3158a
ignore generated includes for docs
shelhamer Jan 19, 2017
9ab6709
copyright spans 2014-2017
shelhamer Jan 19, 2017
c86433a
Merge pull request #3365 from BonsaiAI/wrap-declarations-in-switch
shelhamer Jan 19, 2017
bc0d680
Merge pull request #5184 from shaibagon/fix_batch_norm_param_upgrade
shelhamer Jan 20, 2017
5f84ad7
Merge pull request #5198 from longjon/config-backslash
shelhamer Jan 20, 2017
4056f79
Docker refresh: simplified & update to 16.04, cuda8, cudnn5, nccl
cypof Jan 18, 2017
b8fa34d
Merge pull request #5153 from cypof/docker
cypof Jan 20, 2017
1354403
cmake: bump soversion to rc4
cdluminate Jan 21, 2017
3a0b6c6
Update a comment in caffe.proto
ftokarev Jan 21, 2017
3babd4e
Merge pull request #5207 from CDLuminate/cmake-bump-soversion-to-rc4
shelhamer Jan 22, 2017
e0cd852
Restore can be invoked on rank > 0
cypof Jan 23, 2017
51f2986
Merge pull request #5215 from cypof/fix_restore
cypof Jan 23, 2017
29f0cdb
parse_log.py was not using --verbose argument
kts Jan 24, 2017
b015b73
Merge pull request #5220 from kts/bugfix
shelhamer Jan 24, 2017
6bf10af
Fix broken links in layer documentation, minor fixes.
williford Jan 20, 2017
746a77e
Merge pull request #5227 from williford/caffe-git-pr2
shelhamer Jan 26, 2017
7b5731c
Remove sdk version from veclib searching path.
solrex Jan 30, 2017
cd89d4b
docs: update install_apt_debian guide
cdluminate Feb 1, 2017
39f28e4
Merge pull request #5242 from CDLuminate/doc-update-debian-guide
shelhamer Feb 1, 2017
734702b
Document switch to explicit flags for docker: cpu / gpu.
cypof Feb 8, 2017
9c201e1
make: bump version to rc4
shelhamer Feb 9, 2017
15dfcc1
Add Pascal CUDA architectures to Makefile.config.example
crowsonkb Feb 9, 2017
d8f7953
Merge pull request #5272 from crowsonkb/master
shelhamer Feb 10, 2017
929135b
Merge pull request #5210 from ftokarev/patches
shelhamer Feb 16, 2017
28ffe9c
Merge pull request #5236 from solrex/veclib-fix
shelhamer Feb 16, 2017
c510e33
Merge pull request #4347 from nitnelave/python/layer_dict
shelhamer Feb 17, 2017
c5fad40
Merge pull request #3893 from rscohn2/patch-1
shelhamer Feb 17, 2017
8a7a61a
Merge pull request #5074 from garion9013/master
shelhamer Feb 17, 2017
4b65348
Merge pull request #5010 from ngaloppo/fix_drawnet
shelhamer Feb 17, 2017
25dfdfb
Merge pull request #4721 from kashefy/fix_matlab_demo_typos
shelhamer Feb 17, 2017
475d619
Merge pull request #4737 from rokm/matcaffe-individual-destruct
shelhamer Feb 17, 2017
9bb1b9c
Merge pull request #4609 from intelfx/BVLC-work-buildsystem
shelhamer Feb 17, 2017
23fca12
version bump: rc5
shelhamer Feb 17, 2017
16467ff
Merge pull request #5296 from shelhamer/rc5
shelhamer Feb 21, 2017
85ab610
fix broken link to hinge loss
shelhamer Feb 27, 2017
fe9e58d
Remove not used variable in base_conv_layer.cpp
zhuyuanhao Mar 1, 2017
e687a71
Merge pull request #4630 from BlGene/load_hdf5_fix
shelhamer Mar 8, 2017
4529f12
Removed some 'warning: extra ‘;’ [-Wpedantic]'
gineshidalgo99 Mar 10, 2017
1d3e6e4
Solver_add_nccl accepts any kind of Solver
jfolz Mar 13, 2017
317d162
Merge pull request #5393 from jfolz/master
cypof Mar 13, 2017
93993a3
Init test net on all GPUs, allows parallel inference
cypof Mar 14, 2017
802d90f
Added python 3 compatibility to cpp_lint.py
willyd Mar 17, 2017
accd188
sane h5df file type check for weights
BlGene Mar 8, 2017
367a6e2
Merge pull request #5372 from BlGene/hdf5-load-fix
erictzeng Mar 21, 2017
11930f1
Clarify batch norm parameter documentation.
williford Mar 22, 2017
5c8e354
[caffe][build] added Atlas lapack Library name atllapack
BlGene Mar 22, 2017
1e02d62
[caffe][build] added ABS_TEST_DATA_DIR var.
BlGene Mar 22, 2017
793bd96
Merge pull request #5434 from williford/batchnorm_doc2
shelhamer Mar 23, 2017
8602a23
Expose share_weights to python to allow running test nets
cypof Mar 27, 2017
850ffd8
Remove missed legacy parallel code
cypof Mar 27, 2017
9bd80b2
Fix typo in test_caffe_main.cpp: defice -> device
YuduoWu Mar 29, 2017
a32114e
Fixed memory leaks in cudnn conv and relu
willcrichton Mar 31, 2017
a2601ed
Revert "Fix Python net drawing script"
lukeyeager Mar 31, 2017
0096fe3
Add support for cuDNN v6
flx42 Mar 31, 2017
179dafd
Add test for caffe.draw.draw_net()
lukeyeager Mar 31, 2017
5ad9e53
Merge pull request #5478 from flx42/cudnn6-support
shelhamer Mar 31, 2017
c0597b1
Merge pull request #5477 from lukeyeager/bvlc/test-draw-net
shelhamer Mar 31, 2017
41e34c9
Minor fix for net drawing script
nitheeshas Apr 4, 2017
31bfe8f
Add main() for draw_net unittest, fix import errors
nitheeshas Apr 4, 2017
5f1ca84
Add example and small blurb about sigmoid layer.
williford Apr 5, 2017
e9f7941
Merge pull request #5487 from nitheeshas/fix-draw-net
shelhamer Apr 6, 2017