Skip to content
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

WIP: Add TSVD #184

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

WIP: Add TSVD #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
b562de9
initial commit.
rhl- Jan 20, 2016
0139195
tsvd.hpp
rhl- Jan 21, 2016
cd17473
TSVD initial implementation.
rhl- Jan 21, 2016
8e8792d
TSVD initial implementation compiling.
rhl- Jan 22, 2016
be9754f
trying to finish things off..
rhl- Jan 22, 2016
f53d538
Merge remote-tracking branch 'origin' into add_tsvd
rhl- Aug 23, 2016
66aab5d
fix up tests and header.
rhl- Aug 23, 2016
9d0f66c
Merge branch 'master' of github.com:elemental/Elemental into add_tsvd
rhl- Oct 18, 2016
0f59fe4
Merge branch 'add_tsvd' of github.com:elemental/Elemental into add_tsvd
rhl- Oct 18, 2016
a999e2e
Merge branch 'master' into add_tsvd
rhl- Feb 17, 2017
ac943c3
added Abs and need to fix Abs for vectors still.
rhl- Feb 17, 2017
e132c82
Merge branch 'add_tsvd' of github.com:elemental/Elemental into add_tsvd
rhl- Feb 17, 2017
4fd1ec7
Patch CMake to not build every commit. Stolen from BFGS branch. Fix t…
rhl- Feb 17, 2017
c7ab140
fix the Clang builds.
rhl- Feb 17, 2017
701489a
fix up some bugs.
rhl- Feb 17, 2017
d34f0c6
temporarily remote TSVD from spectral header to make debugging faster.
rhl- Feb 17, 2017
dc4a539
Refactored code to make it more readable.
rhl- Feb 18, 2017
936a5a5
get the code to compile.
rhl- Feb 18, 2017
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
30 changes: 9 additions & 21 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,29 +265,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)
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
1 change: 1 addition & 0 deletions include/El/lapack_like/spectral.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2012,6 +2012,7 @@ DistMatrix<Int,VR,STAR> HessenbergSpectralCloud
#include <El/lapack_like/spectral/Schur.hpp>
#include <El/lapack_like/spectral/HermitianEig.hpp>
#include <El/lapack_like/spectral/SVD.hpp>
//#include <El/lapack_like/spectral/TSVD.hpp>
#include <El/lapack_like/spectral/Lanczos.hpp>
#include <El/lapack_like/spectral/ProductLanczos.hpp>

Expand Down
Loading