diff --git a/.Doxyfile b/.Doxyfile index 432c9c62f1c..a652adf69ea 100644 --- a/.Doxyfile +++ b/.Doxyfile @@ -194,7 +194,7 @@ QT_AUTOBRIEF = NO # tag to YES if you prefer the old behavior instead. # # Note that setting this tag to YES also means that rational rose comments are -# not recognized any more. +# not recognized anymore. # The default value is: NO. MULTILINE_CPP_IS_BRIEF = NO @@ -268,7 +268,7 @@ OPTIMIZE_OUTPUT_VHDL = NO # parses. With this tag you can assign which parser to use for a given # extension. Doxygen has a built-in mapping, but you can override or extend it # using this tag. The format is ext=language, where ext is a file extension, and -# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# language is one of the parsers supported by doxygen: IDL, Java, JavaScript, # C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: # FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: # Fortran. In the later case the parser tries to guess whether the code is fixed @@ -494,7 +494,7 @@ INTERNAL_DOCS = NO # If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file # names in lower-case letters. If set to YES upper-case letters are also # allowed. This is useful if you have classes or files whose names only differ -# in case and if your file system supports case sensitive file names. Windows +# in case and if your file system supports case-sensitive file names. Windows # and Mac users are advised to set this option to NO. # The default value is: system dependent. @@ -654,7 +654,7 @@ SHOW_NAMESPACES = YES # The FILE_VERSION_FILTER tag can be used to specify a program or script that # doxygen should invoke to get the current version for each file (typically from # the version control system). Doxygen will invoke the program by executing (via -# popen()) the command command input-file, where command is the value of the +# popen()) the command input-file, where command is the value of the # FILE_VERSION_FILTER tag, and input-file is the name of an input file provided # by doxygen. Whatever the program writes to standard output is used as the file # version. For an example see the documentation. @@ -1402,7 +1402,7 @@ EXT_LINKS_IN_WINDOW = NO FORMULA_FONTSIZE = 10 -# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# Use the FORMULA_TRANSPARENT tag to determine whether or not the images # generated for formulas are transparent PNGs. Transparent PNGs are not # supported properly for IE 6.0, but are supported on all modern browsers. # @@ -1414,7 +1414,7 @@ FORMULA_FONTSIZE = 10 FORMULA_TRANSPARENT = YES # Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see -# http://www.mathjax.org) which uses client side Javascript for the rendering +# http://www.mathjax.org) which uses client side JavaScript for the rendering # instead of using prerendered bitmaps. Use this if you do not have LaTeX # installed or if you want to formulas look prettier in the HTML output. When # enabled you may also need to install MathJax separately and configure the path @@ -1484,7 +1484,7 @@ MATHJAX_CODEFILE = SEARCHENGINE = YES # When the SERVER_BASED_SEARCH tag is enabled the search engine will be -# implemented using a web server instead of a web client using Javascript. There +# implemented using a web server instead of a web client using JavaScript. There # are two flavors of web server based searching depending on the EXTERNAL_SEARCH # setting. When disabled, doxygen will generate a PHP script for searching and # an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing @@ -1620,7 +1620,7 @@ EXTRA_PACKAGES = amsmath \ # Note: Only use a user-defined header if you know what you are doing! The # following commands have a special meaning inside the header: $title, # $datetime, $date, $doxygenversion, $projectname, $projectnumber, -# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string, # for the replacement values of the other commands the user is refered to # HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. diff --git a/CMakeLists.txt b/CMakeLists.txt index 27d172f900b..00a2ef70b8f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,12 +73,12 @@ include_directories(${PROJECT_BINARY_DIR}) # ---[ Includes & defines for CUDA -# cuda_compile() does not have per-call dependencies or include pathes +# cuda_compile() does not have per-call dependencies or include paths # (cuda_compile() has per-call flags, but we set them here too for clarity) # -# list(REMOVE_ITEM ...) invocations remove PRIVATE and PUBLIC keywords from collected definitions and include pathes +# list(REMOVE_ITEM ...) invocations remove PRIVATE and PUBLIC keywords from collected definitions and include paths if(HAVE_CUDA) - # pass include pathes to cuda_include_directories() + # pass include paths to cuda_include_directories() set(Caffe_ALL_INCLUDE_DIRS ${Caffe_INCLUDE_DIRS}) list(REMOVE_ITEM Caffe_ALL_INCLUDE_DIRS PRIVATE PUBLIC) cuda_include_directories(${Caffe_INCLUDE_DIR} ${Caffe_SRC_DIR} ${Caffe_ALL_INCLUDE_DIRS}) diff --git a/Makefile b/Makefile index b7660e852d6..de8cc7a502c 100644 --- a/Makefile +++ b/Makefile @@ -262,7 +262,7 @@ endif ifeq ($(LINUX), 1) CXX ?= /usr/bin/g++ GCCVERSION := $(shell $(CXX) -dumpversion | cut -f1,2 -d.) - # older versions of gcc are too dumb to build boost with -Wuninitalized + # older versions of gcc are too dumb to build boost with -Wuninitialized ifeq ($(shell echo | awk '{exit $(GCCVERSION) < 4.6;}'), 1) WARNINGS += -Wno-uninitialized endif @@ -423,7 +423,7 @@ CXXFLAGS += -MMD -MP COMMON_FLAGS += $(foreach includedir,$(INCLUDE_DIRS),-I$(includedir)) CXXFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS) NVCCFLAGS += -ccbin=$(CXX) -Xcompiler -fPIC $(COMMON_FLAGS) -# mex may invoke an older gcc that is too liberal with -Wuninitalized +# mex may invoke an older gcc that is too liberal with -Wuninitialized MATLAB_CXXFLAGS := $(CXXFLAGS) -Wno-uninitialized LINKFLAGS += -pthread -fPIC $(COMMON_FLAGS) $(WARNINGS) diff --git a/cmake/Cuda.cmake b/cmake/Cuda.cmake index e03feabffcb..50c55e16810 100644 --- a/cmake/Cuda.cmake +++ b/cmake/Cuda.cmake @@ -2,7 +2,7 @@ if(CPU_ONLY) return() endif() -# Known NVIDIA GPU achitectures Caffe can be compiled for. +# Known NVIDIA GPU architectures Caffe can be compiled for. # This list will be used for CUDA_ARCH_NAME = All option set(Caffe_known_gpu_archs "20 21(20) 30 35 50 60 61") @@ -37,7 +37,7 @@ function(caffe_detect_installed_gpus out_variable) if(__nvcc_res EQUAL 0) string(REPLACE "2.1" "2.1(2.0)" __nvcc_out "${__nvcc_out}") - set(CUDA_gpu_detect_output ${__nvcc_out} CACHE INTERNAL "Returned GPU architetures from caffe_detect_gpus tool" FORCE) + set(CUDA_gpu_detect_output ${__nvcc_out} CACHE INTERNAL "Returned GPU architectures from caffe_detect_gpus tool" FORCE) endif() endif() @@ -64,14 +64,14 @@ function(caffe_select_nvcc_arch_flags out_variable) endif() # set CUDA_ARCH_NAME strings (so it will be seen as dropbox in CMake-Gui) - set(CUDA_ARCH_NAME ${__archs_name_default} CACHE STRING "Select target NVIDIA GPU achitecture.") + set(CUDA_ARCH_NAME ${__archs_name_default} CACHE STRING "Select target NVIDIA GPU architecture.") set_property( CACHE CUDA_ARCH_NAME PROPERTY STRINGS "" ${__archs_names} ) mark_as_advanced(CUDA_ARCH_NAME) # verify CUDA_ARCH_NAME value if(NOT ";${__archs_names};" MATCHES ";${CUDA_ARCH_NAME};") string(REPLACE ";" ", " __archs_names "${__archs_names}") - message(FATAL_ERROR "Only ${__archs_names} architeture names are supported.") + message(FATAL_ERROR "Only ${__archs_names} architecture names are supported.") endif() if(${CUDA_ARCH_NAME} STREQUAL "Manual") @@ -273,7 +273,7 @@ if(Boost_VERSION EQUAL 105500) set(CUDA_NVCC_FLAGS "${CUDA_NVCC_FLAGS} \"-DBOOST_NOINLINE=__attribute__((noinline))\" ") endif() -# disable some nvcc diagnostic that apears in boost, glog, glags, opencv, etc. +# disable some nvcc diagnostic that appears in boost, glog, glags, opencv, etc. foreach(diag cc_clobber_ignored integer_sign_change useless_using_declaration set_but_not_used) list(APPEND CUDA_NVCC_FLAGS -Xcudafe --diag_suppress=${diag}) endforeach() diff --git a/cmake/Misc.cmake b/cmake/Misc.cmake index fcb246472f0..6f2981183bb 100644 --- a/cmake/Misc.cmake +++ b/cmake/Misc.cmake @@ -33,8 +33,8 @@ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE CACHE BOOLEAN "Use link paths for sha set(CMAKE_MACOSX_RPATH TRUE) list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES - ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} __is_systtem_dir) -if(${__is_systtem_dir} STREQUAL -1) + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} __is_system_dir) +if(${__is_system_dir} STREQUAL -1) set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}) endif() diff --git a/cmake/Modules/FindAtlas.cmake b/cmake/Modules/FindAtlas.cmake index 7ffa6393bbc..708e2770810 100644 --- a/cmake/Modules/FindAtlas.cmake +++ b/cmake/Modules/FindAtlas.cmake @@ -7,7 +7,7 @@ # Atlas_FOUND # Atlas_INCLUDE_DIRS # Atlas_LIBRARIES -# Atlas_LIBRARYRARY_DIRS +# Atlas_LIBRARY_DIRS set(Atlas_INCLUDE_SEARCH_PATHS /usr/include/atlas diff --git a/cmake/Modules/FindGFlags.cmake b/cmake/Modules/FindGFlags.cmake index 29b60f05037..90655f10f13 100644 --- a/cmake/Modules/FindGFlags.cmake +++ b/cmake/Modules/FindGFlags.cmake @@ -7,7 +7,7 @@ # GFLAGS_FOUND # GFLAGS_INCLUDE_DIRS # GFLAGS_LIBRARIES -# GFLAGS_LIBRARYRARY_DIRS +# GFLAGS_LIBRARY_DIRS include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindGlog.cmake b/cmake/Modules/FindGlog.cmake index 99abbe478a0..eb32fb4ec82 100644 --- a/cmake/Modules/FindGlog.cmake +++ b/cmake/Modules/FindGlog.cmake @@ -7,7 +7,7 @@ # GLOG_FOUND # GLOG_INCLUDE_DIRS # GLOG_LIBRARIES -# GLOG_LIBRARYRARY_DIRS +# GLOG_LIBRARY_DIRS include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindNumPy.cmake b/cmake/Modules/FindNumPy.cmake index a671494caba..12591585b34 100644 --- a/cmake/Modules/FindNumPy.cmake +++ b/cmake/Modules/FindNumPy.cmake @@ -43,7 +43,7 @@ if(PYTHONINTERP_FOUND) endif() endif() else() - message(STATUS "To find NumPy Python interpretator is required to be found.") + message(STATUS "To find NumPy Python interpreter is required to be found.") endif() include(FindPackageHandleStandardArgs) diff --git a/cmake/Modules/FindSnappy.cmake b/cmake/Modules/FindSnappy.cmake index eff2a864a7b..ece42e92f8c 100644 --- a/cmake/Modules/FindSnappy.cmake +++ b/cmake/Modules/FindSnappy.cmake @@ -22,7 +22,7 @@ if(SNAPPY_FOUND) mark_as_advanced(Snappy_INCLUDE_DIR Snappy_LIBRARIES) caffe_parse_header(${Snappy_INCLUDE_DIR}/snappy-stubs-public.h - SNAPPY_VERION_LINES SNAPPY_MAJOR SNAPPY_MINOR SNAPPY_PATCHLEVEL) + SNAPPY_VERSION_LINES SNAPPY_MAJOR SNAPPY_MINOR SNAPPY_PATCHLEVEL) set(Snappy_VERSION "${SNAPPY_MAJOR}.${SNAPPY_MINOR}.${SNAPPY_PATCHLEVEL}") endif() diff --git a/cmake/Modules/FindvecLib.cmake b/cmake/Modules/FindvecLib.cmake index 4d44e613a00..fc18f0b92ca 100644 --- a/cmake/Modules/FindvecLib.cmake +++ b/cmake/Modules/FindvecLib.cmake @@ -1,4 +1,4 @@ -# Find the vecLib libraries as part of Accelerate.framework or as standalon framework +# Find the vecLib libraries as part of Accelerate.framework or as standalone framework # # The following are set after configuration is done: # VECLIB_FOUND diff --git a/cmake/ProtoBuf.cmake b/cmake/ProtoBuf.cmake index 72ea3230c50..84468ec7da5 100644 --- a/cmake/ProtoBuf.cmake +++ b/cmake/ProtoBuf.cmake @@ -15,7 +15,7 @@ endif() if(PROTOBUF_FOUND) # fetches protobuf version - caffe_parse_header(${PROTOBUF_INCLUDE_DIR}/google/protobuf/stubs/common.h VERION_LINE GOOGLE_PROTOBUF_VERSION) + caffe_parse_header(${PROTOBUF_INCLUDE_DIR}/google/protobuf/stubs/common.h VERSION_LINE GOOGLE_PROTOBUF_VERSION) string(REGEX MATCH "([0-9])00([0-9])00([0-9])" PROTOBUF_VERSION ${GOOGLE_PROTOBUF_VERSION}) set(PROTOBUF_VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}.${CMAKE_MATCH_3}") unset(GOOGLE_PROTOBUF_VERSION) diff --git a/cmake/Summary.cmake b/cmake/Summary.cmake index 40b8c2f2966..9fb9748c04f 100644 --- a/cmake/Summary.cmake +++ b/cmake/Summary.cmake @@ -168,7 +168,7 @@ function(caffe_print_configuration_summary) caffe_status("") endif() if(BUILD_docs) - caffe_status("Documentaion:") + caffe_status("Documentation:") caffe_status(" Doxygen :" DOXYGEN_FOUND THEN "${DOXYGEN_EXECUTABLE} (${DOXYGEN_VERSION})" ELSE "No") caffe_status(" config_file : ${DOXYGEN_config_file}") diff --git a/cmake/Templates/CaffeConfig.cmake.in b/cmake/Templates/CaffeConfig.cmake.in index 77c4059e560..6062d0dda14 100644 --- a/cmake/Templates/CaffeConfig.cmake.in +++ b/cmake/Templates/CaffeConfig.cmake.in @@ -46,7 +46,7 @@ if(NOT TARGET caffe AND NOT caffe_BINARY_DIR) endif() # List of IMPORTED libs created by CaffeTargets.cmake -# These targets already specify all needed definitions and include pathes +# These targets already specify all needed definitions and include paths set(Caffe_LIBRARIES caffe) # Cuda support variables diff --git a/cmake/lint.cmake b/cmake/lint.cmake index 70a006572bb..58b4bbdaa46 100644 --- a/cmake/lint.cmake +++ b/cmake/lint.cmake @@ -2,7 +2,7 @@ set(CMAKE_SOURCE_DIR ..) set(LINT_COMMAND ${CMAKE_SOURCE_DIR}/scripts/cpp_lint.py) set(SRC_FILE_EXTENSIONS h hpp hu c cpp cu cc) -set(EXCLUDE_FILE_EXTENSTIONS pb.h pb.cc) +set(EXCLUDE_FILE_EXTENSIONS pb.h pb.cc) set(LINT_DIRS include src/caffe examples tools python matlab) cmake_policy(SET CMP0009 NEW) # suppress cmake warning @@ -16,7 +16,7 @@ foreach(ext ${SRC_FILE_EXTENSIONS}) endforeach() # find all files that should be excluded -foreach(ext ${EXCLUDE_FILE_EXTENSTIONS}) +foreach(ext ${EXCLUDE_FILE_EXTENSIONS}) file(GLOB_RECURSE FOUND_FILES ${CMAKE_SOURCE_DIR}/*.${ext}) set(EXCLUDED_FILES ${EXCLUDED_FILES} ${FOUND_FILES}) endforeach() diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt index ae47e461736..4134d81cebf 100644 --- a/docs/CMakeLists.txt +++ b/docs/CMakeLists.txt @@ -40,7 +40,7 @@ function(gather_notebooks_as_prebuild_cmd target gathered_dir root) set(full_gathered_dir ${root}/${gathered_dir}) if(NOT PYTHON_EXECUTABLE) - message(STATUS "Python interpeter is not found. Can't include *.ipynb files in docs. Skipping...") + message(STATUS "Python interpreter is not found. Can't include *.ipynb files in docs. Skipping...") return() endif() diff --git a/docs/development.md b/docs/development.md index 36cd399512e..a81f0fe1ea9 100644 --- a/docs/development.md +++ b/docs/development.md @@ -45,7 +45,7 @@ Post [Issues](https://github.com/BVLC/caffe/issues) to propose features, report Large-scale development work is guided by [milestones], which are sets of Issues selected for bundling as releases. Please note that since the core developers are largely researchers, we may work on a feature in isolation for some time before releasing it to the community, so as to claim honest academic contribution. -We do release things as soon as a reasonable technical report may be written, and we still aim to inform the community of ongoing development through Github Issues. +We do release things as soon as a reasonable technical report may be written, and we still aim to inform the community of ongoing development through GitHub Issues. **When you are ready to develop a feature or fixing a bug, follow this protocol**: diff --git a/docs/index.md b/docs/index.md index b633f7cfddc..a85ac326343 100644 --- a/docs/index.md +++ b/docs/index.md @@ -27,7 +27,7 @@ That's 1 ms/image for inference and 4 ms/image for learning and more recent libr We believe that Caffe is among the fastest convnet implementations available. **Community**: Caffe already powers academic research projects, startup prototypes, and even large-scale industrial applications in vision, speech, and multimedia. -Join our community of brewers on the [caffe-users group](https://groups.google.com/forum/#!forum/caffe-users) and [Github](https://github.com/BVLC/caffe/). +Join our community of brewers on the [caffe-users group](https://groups.google.com/forum/#!forum/caffe-users) and [GitHub](https://github.com/BVLC/caffe/).
\* With the ILSVRC2012-winning [SuperVision](http://www.image-net.org/challenges/LSVRC/2012/supervision.pdf) model and prefetching IO.
@@ -93,7 +93,7 @@ The BAIR members who have contributed to Caffe are (alphabetical by first name):
[Carl Doersch](http://www.carldoersch.com/), [Eric Tzeng](https://github.com/erictzeng), [Evan Shelhamer](http://imaginarynumber.net/), [Jeff Donahue](http://jeffdonahue.com/), [Jon Long](https://github.com/longjon), [Philipp Krähenbühl](http://www.philkr.net/), [Ronghang Hu](http://ronghanghu.com/), [Ross Girshick](http://www.cs.berkeley.edu/~rbg/), [Sergey Karayev](http://sergeykarayev.com/), [Sergio Guadarrama](http://www.eecs.berkeley.edu/~sguada/), [Takuya Narihira](https://github.com/tnarihi), and [Yangqing Jia](http://daggerfs.com/).
The open-source community plays an important and growing role in Caffe's development.
-Check out the Github [project pulse](https://github.com/BVLC/caffe/pulse) for recent activity and the [contributors](https://github.com/BVLC/caffe/graphs/contributors) for the full list.
+Check out the GitHub [project pulse](https://github.com/BVLC/caffe/pulse) for recent activity and the [contributors](https://github.com/BVLC/caffe/graphs/contributors) for the full list.
We sincerely appreciate your interest and contributions!
If you'd like to contribute, please read the [developing & contributing](development.html) guide.
diff --git a/docs/install_apt_debian.md b/docs/install_apt_debian.md
index 0a6a3b962e5..9eb61973642 100644
--- a/docs/install_apt_debian.md
+++ b/docs/install_apt_debian.md
@@ -98,7 +98,7 @@ Note, this requires a `deb-src` entry in your `/etc/apt/sources.list`.
#### Compiler Combinations
-Some users may find their favorate compiler doesn't work with CUDA.
+Some users may find their favorite compiler doesn't work with CUDA.
```
CXX compiler | CUDA 7.5 | CUDA 8.0 | CUDA 9.0 |
diff --git a/docs/model_zoo.md b/docs/model_zoo.md
index 3f77e82572c..02be2c6be0f 100644
--- a/docs/model_zoo.md
+++ b/docs/model_zoo.md
@@ -9,7 +9,7 @@ These models are learned and applied for problems ranging from simple regression
To help share these models, we introduce the model zoo framework:
- A standard format for packaging Caffe model info.
-- Tools to upload/download model info to/from Github Gists, and to download trained `.caffemodel` binaries.
+- Tools to upload/download model info to/from GitHub Gists, and to download trained `.caffemodel` binaries.
- A central wiki page for sharing model info Gists.
## Where to get trained models
@@ -46,9 +46,9 @@ This simple format can be handled through bundled scripts or manually if need be
### Hosting model info
-Github Gist is a good format for model info distribution because it can contain multiple files, is versionable, and has in-browser syntax highlighting and markdown rendering.
+GitHub Gist is a good format for model info distribution because it can contain multiple files, is versionable, and has in-browser syntax highlighting and markdown rendering.
-`scripts/upload_model_to_gist.sh