Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aetf committed Feb 12, 2019
2 parents e2945ac + 4b86105 commit 03b43b7
Show file tree
Hide file tree
Showing 341 changed files with 33,726 additions and 8,975 deletions.
121 changes: 121 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,121 @@
---
Language: Cpp
BasedOnStyle: LLVM
AccessModifierOffset: -4
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignEscapedNewlines: Right
AlignOperands: true
AlignTrailingComments: true
AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Empty
AllowShortIfStatementsOnASingleLine: false
AllowShortLoopsOnASingleLine: false
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: false
AlwaysBreakTemplateDeclarations: true
BinPackArguments: true
BinPackParameters: true
BraceWrapping:
AfterClass: true
AfterControlStatement: false
AfterEnum: true
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Custom
BreakBeforeInheritanceComma: false
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
BreakConstructorInitializers: BeforeComma
BreakAfterJavaFieldAnnotations: false
BreakStringLiterals: true
ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
Cpp11BracedListStyle: true
DerivePointerAlignment: false
DisableFormat: false
ExperimentalAutoDetectBinPacking: false
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- Q_FOREVER
- BOOST_FOREACH
IncludeBlocks: Regroup
IncludeCategories:
- Regex: 'tensorflow_headers\.h'
Priority: -1
- Regex: '^"'
Priority: 3
- Regex: '^(<|")(tensorflow|third_party)/'
Priority: 5
- Regex: '^<boost/'
Priority: 7
- Regex: '^<.+\.'
Priority: 6
- Regex: '^<'
Priority: 10
IncludeIsMainRegex: '(_test)?$'
IndentCaseLabels: false
IndentPPDirectives: None
IndentWidth: 4
IndentWrappedFunctionNames: false
JavaScriptQuotes: Single
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 1
NamespaceIndentation: None
ObjCBlockIndentWidth: 4
ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: true
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 100
PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120
PenaltyBreakString: 1000
PenaltyExcessCharacter: 1000
PenaltyReturnTypeOnItsOwnLine: 10000
PointerAlignment: Right
RawStringFormats:
- Delimiter: pb
Language: TextProto
BasedOnStyle: google
ReflowComments: true
SortIncludes: true
SortUsingDeclarations: true
SpaceAfterCStyleCast: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInContainerLiterals: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: Cpp11
TabWidth: 4
UseTab: Never
...

54 changes: 54 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
Checks: "*,-llvm-*,
-cert-env33-c,
-cert-dcl50-cpp,
-cert-dcl59-cpp,
-cppcoreguidelines-no-malloc,
-cppcoreguidelines-pro-bounds-constant-array-index,
-cppcoreguidelines-pro-bounds-pointer-arithmetic,
-cppcoreguidelines-pro-bounds-array-to-pointer-decay,
-cppcoreguidelines-pro-type-const-cast,
-cppcoreguidelines-pro-type-cstyle-cast,
-cppcoreguidelines-pro-type-reinterpret-cast,
-cppcoreguidelines-pro-type-union-access,
-cppcoreguidelines-pro-type-vararg,
-cppcoreguidelines-special-member-functions,
-cppcoreguidelines-owning-memory,
-fuchsia-*,
-google-*,
google-explicit-constructor,
google-runtime-member-string-references,
google-runtime-memset,
google-runtime-operator,
-hicpp-named-parameter,
-hicpp-no-assembler,
-hicpp-function-size,
-hicpp-special-member-functions,
-hicpp-vararg,
-hicpp-no-array-decay,
-readability-else-after-return,
-readability-implicit-bool-cast,
-readability-named-parameter,
-readability-simplify-boolean-expr,
-readability-braces-around-statements,
-readability-identifier-naming,
-readability-function-size,
-readability-redundant-member-init,
-readability-static-accessed-through-instance,
-misc-bool-pointer-implicit-conversion,
-misc-definitions-in-headers,
-misc-unused-alias-decls,
-misc-unused-parameters,
-misc-unused-using-decls,
-modernize-use-using,
-modernize-use-default-member-init,
-modernize-use-bool-literals"
WarningsAsErrors: ''
HeaderFilterRegex: ''
AnalyzeTemporaryDtors: false
FormatStyle: 'file'
CheckOptions:
- key: readability-implicit-bool-conversion.AllowIntegerConditions
value: 1
- key: readability-implicit-bool-conversion.AllowPointerConditions
value: 1
8 changes: 8 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
benchmarks
build
scripts
spack-packages
tests/*data
Dockerfile
*.pyc
__pycache__
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,10 @@ MNIST_data
tests/*
tests/*.output
tests/verbose.log
!tests/test_tf/*
!tests/test_tf
!tests/test_tf/**
!tests/driver
!tests/driver/**

# Scripts
scripts/**
Expand All @@ -40,3 +43,6 @@ scripts/**
.cache
__pycache__
*.pyc

# CLion
.idea
49 changes: 49 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
stages:
- build
- test
- release

variables:
DOCKER_HOST: tcp://docker:2375
DOCKER_DRIVER: overlay2
IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG
LATEST_TAG: $CI_REGISTRY_IMAGE:latest

build:
image: docker:latest
stage: build
services:
- docker:dind
tags:
- gpu
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $IMAGE_TAG || docker pull $LATEST_TAG || true
- docker build --cache-from $IMAGE_TAG --cache-from $LATEST_TAG -t $IMAGE_TAG --build-arg APP_ENV=prod .
- docker push $IMAGE_TAG

test-cuda-gpu:
stage: test
image: $IMAGE_TAG
tags:
- gpu
script:
- nvidia-smi

test-sanity:
stage: test
image: $IMAGE_TAG
tags:
- gpu
script:
- salus-server --help

release:
stage: release
services:
- docker:dind
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker pull $IMAGE_TAG
- docker tag $IMAGE_TAG $LATEST_TAG
- docker push $LATEST_TAG
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
path = thirdparty/easyloggingpp
url = https://github.com/muflihun/easyloggingpp.git
ignore = dirty
[submodule "thirdparty/concurrentqueue"]
path = thirdparty/concurrentqueue
url = https://github.com/cameron314/concurrentqueue.git
ignore = dirty
Loading

0 comments on commit 03b43b7

Please sign in to comment.