Merge pull request #2 from ChrisPsa/master

Apply changes required by first review of CALS paper.

.clang-format

@@ -0,0 +1,137 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: MultiLine
+BinPackArguments: true
+BinPackParameters: false
+BraceWrapping:
+  AfterCaseLabel:  false
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      false
+  AfterExternBlock: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     120
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+    SortPriority:    0
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+    SortPriority:    0
+  - Regex:           '.*'
+    Priority:        1
+    SortPriority:    0
+IncludeIsMainRegex: '(Test)?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Right
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+Standard:        Latest
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        8
+UseCRLF:         false
+UseTab:          Never
+...
+

.gitignore

@@ -1,13 +1,15 @@
 .idea
-cmake-build-debug
-cmake-build-release
-cmake-build-matlab
+cmake-build-debug*
+cmake-build-release*
+cmake-build-matlab*
 
 venv
 */*/__pycache__
+*/*/*/__pycache__
 .ipynb_checkpoints/
 */.ipynb_checkpoints/
 
+data/figures
 data/MKL/*.csv
 data/MKL/*/*.csv
 

.travis.yml

@@ -1,43 +1,58 @@
 language: cpp
-dist: bionic
-compiler:
-  - gcc
+
+branches:
+  only:
+    - master
+
+dist: focal
+
+jobs:
+  include:
+    - os: linux
+      env: CC=gcc-8 CXX=g++-8 TOOLSET=gcc COMPILER=g++-8
+    - os: linux
+      env: CC=gcc-10 CXX=g++-10 TOOLSET=gcc COMPILER=g++-10
+    - os: linux
+      env: CC=clang-10 CXX=clang++-10 TOOLSET=clang COMPILER=clang++-10
+
 addons:
   apt:
-#    sources:
-#      - ubuntu-toolchain-r-test
+    sources:
+      - sourceline: 'ppa:ubuntu-toolchain-r/test'
     packages:
       - gcc-8
       - g++-8
-      - cmake
+      - gcc-10
+      - g++-10
+      - clang-10
+      - clang++-10
+      - libomp-dev
       - libgtest-dev
-
-before_install:
-  - wget https://apt.repos.intel.com/intel-gpg-keys/GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
-  - sudo apt-key add GPG-PUB-KEY-INTEL-SW-PRODUCTS-2019.PUB
-  - sudo wget https://apt.repos.intel.com/setup/intelproducts.list -O /etc/apt/sources.list.d/intelproducts.list
-  - sudo apt-get update
-  - sudo apt-get install intel-mkl-2019.5-075 --allow-unauthenticated
+      - libopenblas-dev
 
 install:
-  - if [ "$C" = "gcc" ]; then export C="gcc-8"; fi
-  - if [ "$CXX" = "g++" ]; then export CXX="g++-8"; fi
+  # Extract CMake 3.17.5
+  - wget https://github.com/Kitware/CMake/releases/download/v3.17.5/cmake-3.17.5-Linux-x86_64.tar.gz -qO- | tar xvzf - -C .
+  - export CMAKE_PATH=`pwd`/cmake-3.17.5-Linux-x86_64/bin
+
   # Install GTest
   - pushd .
   - cd /usr/src/gtest
   - sudo mkdir build
   - cd build
-  - sudo cmake ..
+  - sudo ${CMAKE_PATH}/cmake ..
   - sudo make
-  - sudo make install
   - popd
 
-script:
-  - source /opt/intel/bin/compilervars.sh intel64 -platform linux
+before_script:
+  - export PATH=`pwd`/cmake-3.17.5-Linux-x86_64/bin:$PATH
   - mkdir build
   - cd build
-  - cmake -DCMAKE_BUILD_TYPE=RELEASE -DWITH_TRAVIS=On -DWITH_TESTS=On -DWITH_MKL=On -DWITH_BLIS=Off -DWITH_OPENBLAS=Off ..
+  # TODO: Add if statement to check an environment variable specifying either MKL or OpenBLAS and use appropriate lib
+  - cmake -DCMAKE_BUILD_TYPE=RELEASE -DWITH_TRAVIS=On -DWITH_TESTS=On -DWITH_OPENBLAS=On ..
   - VERBOSE=1 cmake --build .
+
+script:
   - ctest -VV
 
 notifications: