Permalink
Browse files

Merge parent changes

  • Loading branch information...
Rezart Qelibari
Rezart Qelibari committed May 23, 2018
2 parents 21d05bc + 8038c4a commit 81d961edc71d233723353cb6203ad3de7ed8dd21
Showing 532 changed files with 370,437 additions and 147,097 deletions.
View
@@ -1,7 +1,7 @@
---
Language: Cpp
# BasedOnStyle: Google
AccessModifierOffset: -1
BasedOnStyle: Google
AccessModifierOffset: -3
AlignAfterOpenBracket: true
AlignEscapedNewlinesLeft: true
AlignOperands: true
@@ -16,19 +16,19 @@ AlwaysBreakAfterDefinitionReturnType: false
AlwaysBreakTemplateDeclarations: true
AlwaysBreakBeforeMultilineStrings: true
BreakBeforeBinaryOperators: None
BreakBeforeTernaryOperators: true
BreakBeforeTernaryOperators: false
BreakConstructorInitializersBeforeComma: false
BinPackParameters: true
BinPackArguments: true
ColumnLimit: 80
ColumnLimit: 100
ConstructorInitializerAllOnOneLineOrOnePerLine: true
ConstructorInitializerIndentWidth: 4
DerivePointerAlignment: true
ExperimentalAutoDetectBinPacking: false
IndentCaseLabels: true
IndentWrappedFunctionNames: false
IndentFunctionDeclarationAfterType: false
MaxEmptyLinesToKeep: 1
MaxEmptyLinesToKeep: 3
KeepEmptyLinesAtTheStartOfBlocks: false
NamespaceIndentation: None
ObjCBlockIndentWidth: 2
@@ -45,15 +45,15 @@ SpacesBeforeTrailingComments: 2
Cpp11BracedListStyle: true
Standard: Auto
IndentWidth: 4
TabWidth: 8
TabWidth: 4
UseTab: Never
BreakBeforeBraces: Attach
BreakBeforeBraces: Allman
SpacesInParentheses: false
SpacesInSquareBrackets: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterCStyleCast: false
SpaceAfterCStyleCast: true
SpacesInContainerLiterals: true
SpaceBeforeAssignmentOperators: true
ContinuationIndentWidth: 4
View
@@ -52,6 +52,19 @@ Thumbs.db
*.blg
*.synctex
# dSpace #
##########
*.map
*.sdf
*.ppc
*.trc
*.trz
*.tmw
*.hex
*.srec
*.mk
*.dsbuildinfo
# External #
############
*external/OOQP
@@ -62,6 +75,7 @@ Thumbs.db
*external/download_script
*external/encrypted_script
*external/encrypted_script_matlab
*external/qore
*download_software
*download_matlab
@@ -71,6 +85,8 @@ Thumbs.db
*.doc
*.swp
build/
include/
lib/
local/
*.dat
octave-workspace
@@ -82,3 +98,9 @@ cmakelint
*.srctrldb
*.srctrlprj
.vs
examples/python/__pycache__/
build*
*rti1401
*.asv
*.swo
*.autosave
View
@@ -5,7 +5,6 @@
[submodule "blasfeo"]
path = external/blasfeo
url = https://github.com/giaf/blasfeo.git
branch = stable
[submodule "qpdunes"]
path = external/qpdunes
url = https://github.com/acados/qpDUNES-dev.git
@@ -21,6 +20,6 @@
path = external/hpipm
url = https://github.com/giaf/hpipm.git
branch = stable
[submodule "external/qpoases"]
[submodule "qpoases"]
path = external/qpoases
url = https://github.com/acados/qpOASES.git
View
@@ -6,10 +6,10 @@ python:
- 3.5
env:
- CXX="g++-6" CC="gcc-6"
- CXX="g++-5" CC="gcc-5"
- CXX="g++-4.9" CC="gcc-4.9" USE_MATLAB=true COVERAGE="lcov"
- CXX="clang++-3.7" CC="clang-3.7"
- CXX="g++-6" CC="gcc-6" SWIG_PYTHON=ON SWIG_MATLAB=OFF # no MATLAB support for gcc>=5
- CXX="g++-5" CC="gcc-5" SWIG_PYTHON=ON SWIG_MATLAB=OFF
- CXX="g++-4.9" CC="gcc-4.9" SWIG_PYTHON=ON SWIG_MATLAB=ON COVERAGE="lcov"
- CXX="clang++-3.7" CC="clang-3.7" SWIG_PYTHON=ON SWIG_MATLAB=OFF
addons:
apt:
@@ -58,7 +58,6 @@ install:
- export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
before_script:
- set -e
- mkdir -p /home/travis/octave_download
- |
if [ -z "$(ls -1qA /home/travis/octave_download)" ]; then
@@ -74,17 +73,17 @@ script:
SWIG_MATLAB=ON;
fi'
- cmake -E make_directory build
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Release -DSWIG_MATLAB=$SWIG_MATLAB -DSWIG_PYTHON=ON ..
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Release ..
- cmake --build build --target lint
- cmake --build build
- cmake -E chdir build ctest --verbose --output-on-failure
- cmake -E chdir build ctest --output-on-failure
- rm -r -f build
- cmake -E make_directory build
- cmake -E chdir build cmake -DCMAKE_TOOLCHAIN_FILE=cmake/Toolchain-mingw32.cmake ..
- cmake --build build --clean-first
- cmake --build build
- rm -r -f build
- cmake -E make_directory build
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTS=ON -DSWIG_MATLAB=$SWIG_MATLAB -DSWIG_PYTHON=ON -DCOVERAGE=$COVERAGE -DCMAKE_INSTALL_PREFIX=$HOME/local ..
- cmake -E chdir build cmake -DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTS=ON -DSWIG_MATLAB=$SWIG_MATLAB -DMatlab_ROOT_DIR=../external/matlab -DSWIG_PYTHON=$SWIG_PYTHON -DCOVERAGE=$COVERAGE -DCMAKE_INSTALL_PREFIX=$HOME/local ..
- export CXX="$CXX -std=c++11" # needed for octave
- cmake --build build
- cmake -E chdir build ctest --output-on-failure
@@ -104,6 +103,9 @@ deploy:
api_key: "${GITHUB_OAUTH_TOKEN}"
file: "${RELEASES_PREFIX}/acados.tar.gz"
skip_cleanup: true
on:
tags: true
after_success:
- pushd build
View
@@ -18,19 +18,19 @@ wget -q http://bitbucket.org/eigen/eigen/get/3.2.10.tar.gz
mkdir -p eigen
tar -xf 3.2.10.tar.gz --strip-components=1 -C eigen
wget -q https://sourceforge.net/projects/casadi/files/CasADi/3.2.3/linux/casadi-octave-v3.2.3.tar.gz
mkdir -p casadi-octave-v3.2.3
tar -xf casadi-octave-v3.2.3.tar.gz -C casadi-octave-v3.2.3
wget -q https://github.com/casadi/casadi/releases/download/3.4.0/casadi-linux-octave-v3.4.0.tar.gz
mkdir -p casadi-octave-v3.4.0
tar -xf casadi-linux-octave-v3.4.0.tar.gz -C casadi-octave-v3.4.0
wget -q https://sourceforge.net/projects/casadi/files/CasADi/3.2.3/linux/casadi-py35-np1.9-v3.2.3.tar.gz
mkdir -p casadi-py35-np1.9-v3.2.3
tar -xf casadi-py35-np1.9-v3.2.3.tar.gz -C casadi-py35-np1.9-v3.2.3
export PYTHONPATH=$(pwd)/casadi-py35-np1.9-v3.2.3:$PYTHONPATH
wget -q https://github.com/casadi/casadi/releases/download/3.4.0/casadi-linux-py35-v3.4.0-64bit.tar.gz
mkdir -p casadi-linux-py35-v3.4.0-64bit
tar -xf casadi-linux-py35-v3.4.0-64bit.tar.gz -C casadi-linux-py35-v3.4.0-64bit
export PYTHONPATH=$(pwd)/casadi-linux-py35-v3.4.0-64bit:$PYTHONPATH
wget -q https://sourceforge.net/projects/casadi/files/CasADi/3.2.3/linux/casadi-matlabR2014b-v3.2.3.tar.gz
mkdir -p casadi-matlabR2014b-v3.2.3
tar -xf casadi-matlabR2014b-v3.2.3.tar.gz -C casadi-matlabR2014b-v3.2.3
export MATLABPATH=$(pwd)/casadi-matlabR2014b-v3.2.3:$MATLABPATH
wget -q https://github.com/casadi/casadi/releases/download/3.4.0/casadi-linux-matlabR2014b-v3.4.0.tar.gz
mkdir -p casadi-linux-matlabR2014b-v3.4.0
tar -xf casadi-linux-matlabR2014b-v3.4.0.tar.gz -C casadi-linux-matlabR2014b-v3.4.0
export MATLABPATH=$(pwd)/casadi-linux-matlabR2014b-v3.4.0:$MATLABPATH
wget -q http://icl.cs.utk.edu/lapack-for-windows/libraries/VisualStudio/3.7.0/Dynamic-MINGW/Win64/libblas.lib
sudo mv libblas.lib /usr/x86_64-w64-mingw32/lib/libblas.a
@@ -47,4 +47,4 @@ export PATH=$(pwd):$PATH
popd # swig
popd # external
popd # external
View
@@ -17,7 +17,7 @@
#
#
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.1)
if(CMAKE_MAKE_PROGRAM)
file(TO_CMAKE_PATH ${CMAKE_MAKE_PROGRAM} CMAKE_MAKE_PROGRAM)
@@ -26,12 +26,7 @@ endif()
project(acados LANGUAGES C CXX)
# if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" AND CMAKE_C_COMPILER_VERSION MATCHES "5")
# add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1)
# endif()
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_VERBOSE_MAKEFILE ON)
list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake")
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
# Set up build type
@@ -45,8 +40,11 @@ message(STATUS "Build type is ${CMAKE_BUILD_TYPE}")
enable_testing(true)
if(CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Werror -fdiagnostics-show-option")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror -fdiagnostics-show-option")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -fdiagnostics-show-option")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -fdiagnostics-show-option")
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /MT")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")
endif()
message(STATUS "Installation directory is ${CMAKE_INSTALL_PREFIX}")
@@ -55,14 +53,27 @@ message(STATUS "Installation directory is ${CMAKE_INSTALL_PREFIX}")
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
set(CMAKE_MACOSX_RPATH TRUE)
# set(CMAKE_INSTALL_RPATH "\$ORIGIN")
# SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
if(EXISTS ${PROJECT_SOURCE_DIR}/external/OOQP AND NOT CMAKE_BUILD_TYPE MATCHES NoExternalLibs)
if(NOT CMAKE_C_COMPILER_ID MATCHES "MSVC")
set(ACADOS_WITH_HPMPC ON CACHE BOOL "Add HPMPC solver")
endif()
if(EXISTS ${PROJECT_SOURCE_DIR}/external/OOQP AND NOT CMAKE_BUILD_TYPE MATCHES NoExternalLibs AND NOT CMAKE_SYSTEM_NAME MATCHES "dSpace")
set(ACADOS_WITH_OOQP ON CACHE BOOL "Add OOQP solver")
endif()
set(CMAKE_MACOSX_RPATH TRUE)
if(EXISTS ${PROJECT_SOURCE_DIR}/external/qore AND NOT CMAKE_BUILD_TYPE MATCHES NoExternalLibs AND NOT CMAKE_SYSTEM_NAME MATCHES "dSpace" AND NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
set(ACADOS_WITH_QORE ON CACHE BOOL "Add QORE solver")
endif()
if(NOT CMAKE_SYSTEM_NAME MATCHES "dSpace")
set(ACADOS_WITH_QPOASES ON CACHE BOOL "Add qpOASES solver")
set(ACADOS_WITH_QPDUNES ON CACHE BOOL "Add qpDUNES solver")
endif()
set(EXTERNAL_SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/external)
# Configure acados
add_subdirectory(acados)
@@ -96,8 +107,4 @@ add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake")
# Cpplint
if (NOT (CMAKE_SYSTEM_NAME MATCHES "dSpace" OR CMAKE_GENERATOR MATCHES "MinGW Makefiles" OR CMAKE_CXX_COMPILER_ID MATCHES "MSVC"))
include(lint)
else()
message(STATUS "Skipping lint (python not found).")
endif()
include(Lint)
View
@@ -1,3 +1,3 @@
set noparent
filter=-legal/copyright,-readability/casting,-runtime/int,-whitespace/blank_line,-readability/fn_size
filter=-legal/copyright,-readability/casting,-runtime/int,-whitespace/blank_line,-readability/fn_size,-runtime/printf,-runtime/references,-whitespace/braces,-whitespace/newline
linelength=100
Oops, something went wrong.

0 comments on commit 81d961e

Please sign in to comment.