Skip to content

WIP: Add BFGS & Catch Test Framework #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
rhl- wants to merge 39 commits into from
Closed

WIP: Add BFGS & Catch Test Framework #183

Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ecdbd59
initial bfgs sketch.
rhl- Aug 30, 2016
440f415
Merge branch 'master' of github.com:elemental/Elemental into add_bfgs
Oct 13, 2016
3ae931b
bfgs compiles. need to debug and such.
Oct 14, 2016
10d1471
more.
Oct 14, 2016
8476dd0
code appears to work correctly for a simple univariate quadratic. nee…
Oct 15, 2016
4037c21
implemented nocedal and wright line search from page 60.
Oct 16, 2016
9d2d910
added the rosenbrock function as a testc ase.
Oct 16, 2016
91b1ed8
added unit test framework, got clion debugging functioning. fixed sma…
Oct 18, 2016
e7e511c
forgot catch header.
Oct 18, 2016
f8dc7fd
Addresses review.
Oct 19, 2016
770baec
capital F.
rhl- Oct 22, 2016
08bf563
addresses review.
rhl- Oct 22, 2016
eef95d8
addresses review.
rhl- Oct 22, 2016
18f082a
disable puredebug.
rhl- Oct 22, 2016
ee3bd00
fix typo.
rhl- Oct 22, 2016
028c8e9
addresses review.
rhl- Oct 22, 2016
6edb245
addresses review items, formatting, and removes un-necessary warning.
rhl- Oct 22, 2016
f3da919
fixes to bfgs.
rhl- Oct 23, 2016
97b0c84
WIP.
rhl- Oct 24, 2016
53a0da2
trying to get the lineSearch routine with interpolation written corre…
rhl- Nov 13, 2016
bd70faf
Update not update.
rhl- Nov 13, 2016
aa99386
fix bug.
rhl- Nov 14, 2016
8b078b2
run each test 10 times just incase there are funny failures.
rhl- Nov 14, 2016
59ec7ce
added more rosenbrock tests.
rhl- Nov 14, 2016
459db88
write less code.
rhl- Nov 14, 2016
66f4769
fix error code handling, perhaps makes test fail?
rhl- Nov 14, 2016
9a59baa
borrowing More & Thuente Interpolation. still not always working.
rhl- Nov 15, 2016
7aef47f
much simpler line search.
rhl- Nov 20, 2016
24557ae
a number of tweaks to the lineSearch, explicit gaurds against some fa…
rhl- Nov 21, 2016
859daee
accidently deleted ptg
rhl- Nov 21, 2016
ea90dfb
fix debug statement
rhl- Nov 21, 2016
dc42de5
add an exception just in case.
rhl- Nov 21, 2016
7e496a6
Merge branch 'master' of github.com:elemental/Elemental into add_bfgs
rhl- Nov 21, 2016
f5d5e96
fix string.
rhl- Nov 21, 2016
7e9bddd
adopting coefficients used by LBFGS
rhl- Nov 21, 2016
d761213
introduced a bug earlier today.
rhl- Nov 21, 2016
de631f2
const bug.
rhl- Nov 21, 2016
9a6c3cf
using nocedals recursive hessian inverse method.
rhl- Nov 21, 2016
3fd404b
tuple access and variables names.
rhl- Nov 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.idea
build/
*.swp
*.pyc
32 changes: 10 additions & 22 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,29 +259,17 @@ if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
message(FATAL_ERROR "In-source build attempted; please clean the CMake cache and then switch to an out-of-source build, e.g.,\nrm CMakeCache.txt && rm -Rf CMakeFiles/\nmkdir build/ && cd build/ && cmake ..")
endif()

# Get the Git revision
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_SHA1)

# Ensure that the build type is set to either Release or Debug
if(CMAKE_BUILD_TYPE STREQUAL "Release")
# This option is okay as-is
set(CMAKE_BUILD_TYPE Release)
elseif(CMAKE_BUILD_TYPE STREQUAL "Debug")
# This option is okay as-is
set(CMAKE_BUILD_TYPE Debug)
elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
message(WARNING "RelWithDebInfo not supported; switching to Release")
set(CMAKE_BUILD_TYPE Release)
elseif(CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
message(WARNING "MinSizeRel not supported; switching to Release")
set(CMAKE_BUILD_TYPE Release)
else()
message(WARNING "Build mode not specified, defaulting to Release build.")
set(CMAKE_BUILD_TYPE Release)
if (NOT CMAKE_BUILD_TYPE)
Copy link
Member

@poulson poulson Oct 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is also important that we handle mis-set build types (e.g., the old PureDebug choice should cause an error). I think that we need to enumerate the allowed values and complain otherwise.

Copy link
Member Author

@rhl- rhl- Oct 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is that an old Elemental build type? whats the difference between it and Debug?

set( CMAKE_BUILD_TYPE Release)
endif()

set(ACCEPTED_BUILD_TYPES Release Debug RelWithDebInfo MinSizeRel)
list(FIND ACCEPTED_BUILD_TYPES ${CMAKE_BUILD_TYPE} IS_BUILD_TYPE_ACCEPTED)
if(${IS_BUILD_TYPE_ACCEPTED} EQUAL -1)
message(FATAL_ERROR "CMAKE_BUILD_TYPE of ${CMAKE_BUILD_TYPE} is not accepted.")
endif()

if(CMAKE_BUILD_TYPE STREQUAL "Release")
if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
set(EL_RELEASE TRUE)
else()
set(EL_RELEASE FALSE)
Expand Down Expand Up @@ -420,7 +408,7 @@ else()
add_dependencies(pmrrr project_openblas)
endif()
endif()

include_directories(external/catch)
# Elemental's modifications of (a subset of) SuiteSparse
# ------------------------------------------------------
add_subdirectory(external/suite_sparse)
Expand Down
Loading