Skip to content

Commit b045049

Browse files
committed
update caffe to latest version. release training guide!
1 parent 8fd5a85 commit b045049

File tree

496 files changed

+143271
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

496 files changed

+143271
-0
lines changed

Diff for: CMakeLists.txt

+73
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
cmake_minimum_required(VERSION 2.8.7)
2+
3+
# ---[ Caffe project
4+
project(Caffe C CXX)
5+
6+
# ---[ Using cmake scripts and modules
7+
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)
8+
9+
include(ExternalProject)
10+
11+
include(cmake/Utils.cmake)
12+
include(cmake/Targets.cmake)
13+
include(cmake/Misc.cmake)
14+
include(cmake/Summary.cmake)
15+
include(cmake/ConfigGen.cmake)
16+
17+
# ---[ Options
18+
caffe_option(CPU_ONLY "Build Caffe without CUDA support" OFF) # TODO: rename to USE_CUDA
19+
caffe_option(USE_CUDNN "Build Caffe with cuDNN libary support" ON IF NOT CPU_ONLY)
20+
caffe_option(BUILD_SHARED_LIBS "Build shared libraries" ON)
21+
caffe_option(BUILD_python "Build Python wrapper" ON)
22+
set(python_version "2" CACHE STRING "Specify which python version to use")
23+
caffe_option(BUILD_matlab "Build Matlab wrapper" OFF IF UNIX OR APPLE)
24+
caffe_option(BUILD_docs "Build documentation" ON IF UNIX OR APPLE)
25+
caffe_option(BUILD_python_layer "Build the Caffe python layer" ON)
26+
27+
# ---[ Dependencies
28+
include(cmake/Dependencies.cmake)
29+
30+
# ---[ Flags
31+
if(UNIX OR APPLE)
32+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -Wall")
33+
endif()
34+
35+
if(USE_libstdcpp)
36+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libstdc++")
37+
message("-- Warning: forcing libstdc++ (controlled by USE_libstdcpp option in cmake)")
38+
endif()
39+
40+
add_definitions(-DGTEST_USE_OWN_TR1_TUPLE)
41+
42+
# ---[ Warnings
43+
caffe_warnings_disable(CMAKE_CXX_FLAGS -Wno-sign-compare -Wno-uninitialized)
44+
45+
# ---[ Config generation
46+
configure_file(cmake/Templates/caffe_config.h.in "${PROJECT_BINARY_DIR}/caffe_config.h")
47+
48+
# ---[ Includes
49+
set(Caffe_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
50+
include_directories(${Caffe_INCLUDE_DIR} ${PROJECT_BINARY_DIR})
51+
include_directories(BEFORE src) # This is needed for gtest.
52+
53+
# ---[ Subdirectories
54+
add_subdirectory(src/gtest)
55+
add_subdirectory(src/caffe)
56+
add_subdirectory(tools)
57+
add_subdirectory(examples)
58+
add_subdirectory(python)
59+
add_subdirectory(matlab)
60+
add_subdirectory(docs)
61+
62+
# ---[ Linter target
63+
add_custom_target(lint COMMAND ${CMAKE_COMMAND} -P ${PROJECT_SOURCE_DIR}/cmake/lint.cmake)
64+
65+
# ---[ pytest target
66+
add_custom_target(pytest COMMAND python${python_version} -m unittest discover -s caffe/test WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python )
67+
add_dependencies(pytest pycaffe)
68+
69+
# ---[ Configuration summary
70+
caffe_print_configuration_summary()
71+
72+
# ---[ Export configs generation
73+
caffe_generate_export_configs()

Diff for: CONTRIBUTING.md

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
# Contributing
2+
3+
## Issues
4+
5+
Specific Caffe design and development issues, bugs, and feature requests are maintained by GitHub Issues.
6+
7+
_Please do not post usage, installation, or modeling questions, or other requests for help to Issues._
8+
Use the [caffe-users list](https://groups.google.com/forum/#!forum/caffe-users) instead. This helps developers maintain a clear, uncluttered, and efficient view of the state of Caffe.
9+
10+
When reporting a bug, it's most helpful to provide the following information, where applicable:
11+
12+
* What steps reproduce the bug?
13+
* Can you reproduce the bug using the latest [master](https://github.com/BVLC/caffe/tree/master), compiled with the `DEBUG` make option?
14+
* What hardware and operating system/distribution are you running?
15+
* If the bug is a crash, provide the backtrace (usually printed by Caffe; always obtainable with `gdb`).
16+
17+
Try to give your issue a title that is succinct and specific. The devs will rename issues as needed to keep track of them.
18+
19+
## Pull Requests
20+
21+
Caffe welcomes all contributions.
22+
23+
See the [contributing guide](http://caffe.berkeleyvision.org/development.html) for details.
24+
25+
Briefly: read commit by commit, a PR should tell a clean, compelling story of _one_ improvement to Caffe. In particular:
26+
27+
* A PR should do one clear thing that obviously improves Caffe, and nothing more. Making many smaller PRs is better than making one large PR; review effort is superlinear in the amount of code involved.
28+
* Similarly, each commit should be a small, atomic change representing one step in development. PRs should be made of many commits where appropriate.
29+
* Please do rewrite PR history to be clean rather than chronological. Within-PR bugfixes, style cleanups, reversions, etc. should be squashed and should not appear in merged PR history.
30+
* Anything nonobvious from the code should be explained in comments, commit messages, or the PR description, as appropriate.

Diff for: CONTRIBUTORS.md

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Contributors
2+
3+
Caffe is developed by a core set of BVLC members and the open-source community.
4+
5+
We thank all of our [contributors](https://github.com/BVLC/caffe/graphs/contributors)!
6+
7+
**For the detailed history of contributions** of a given file, try
8+
9+
git blame file
10+
11+
to see line-by-line credits and
12+
13+
git log --follow file
14+
15+
to see the change log even across renames and rewrites.
16+
17+
Please refer to the [acknowledgements](http://caffe.berkeleyvision.org/#acknowledgements) on the Caffe site for further details.
18+
19+
**Copyright** is held by the original contributor according to the versioning history; see LICENSE.

Diff for: INSTALL.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Installation
2+
3+
See http://caffe.berkeleyvision.org/installation.html for the latest
4+
installation instructions.
5+
6+
Check the issue tracker in case you need help:
7+
https://github.com/BVLC/caffe/issues

Diff for: LICENSE

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
COPYRIGHT
2+
3+
All contributions by the University of California:
4+
Copyright (c) 2014, 2015, The Regents of the University of California (Regents)
5+
All rights reserved.
6+
7+
All other contributions:
8+
Copyright (c) 2014, 2015, the respective contributors
9+
All rights reserved.
10+
11+
Caffe uses a shared copyright model: each contributor holds copyright over
12+
their contributions to Caffe. The project versioning records all such
13+
contribution and copyright details. If a contributor wants to further mark
14+
their specific copyright on a particular contribution, they should indicate
15+
their copyright solely in the commit message of the change when it is
16+
committed.
17+
18+
LICENSE
19+
20+
Redistribution and use in source and binary forms, with or without
21+
modification, are permitted provided that the following conditions are met:
22+
23+
1. Redistributions of source code must retain the above copyright notice, this
24+
list of conditions and the following disclaimer.
25+
2. Redistributions in binary form must reproduce the above copyright notice,
26+
this list of conditions and the following disclaimer in the documentation
27+
and/or other materials provided with the distribution.
28+
29+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
30+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
31+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
32+
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
33+
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
35+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
36+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
37+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
38+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
39+
40+
CONTRIBUTION AGREEMENT
41+
42+
By contributing to the BVLC/caffe repository through pull-request, comment,
43+
or otherwise, the contributor releases their content to the
44+
license and copyright terms herein.

0 commit comments

Comments
 (0)