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.

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

add Topological Optimization code #1043

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ec8d84f
add Topological Optimization code
MohamedKISSI Jul 4, 2024
b8c6768
clang-format the code
MohamedKISSI Jul 4, 2024
12c3512
Fixing torch dependency issue
MohamedKISSI Jul 5, 2024
dddedc6
Give a default value to the constraintDiagram variable so that the tt…
MohamedKISSI Jul 5, 2024
2f0dfb9
set constraintDiagram variable to const
MohamedKISSI Jul 5, 2024
47589c1
We remove the default initialization for certain variables
MohamedKISSI Jul 5, 2024
4a71f05
fix odr violations
MohamedKISSI Jul 5, 2024
2e9f001
fix odr violations getCoordinatesInformations
MohamedKISSI Jul 5, 2024
f320bf1
restored original gui for existing backends
julien-tierny Jul 15, 2024
e876661
progress on ui shuffling
julien-tierny Jul 15, 2024
51b162e
work on solver gui
julien-tierny Jul 15, 2024
a96835d
updated optimization gui
julien-tierny Jul 16, 2024
0f3c0d9
Set default variable values to match XML file and updated PyTorch war…
MohamedKISSI Jul 17, 2024
fbc769e
Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into t…
julien-tierny Jul 18, 2024
a40efab
updated adam unavailability message
julien-tierny Aug 23, 2024
393626e
topological optimization backend refactoring
julien-tierny Aug 23, 2024
34e2ae5
Reformatting console outputs
julien-tierny Aug 23, 2024
726c989
trying to debug windows ci
julien-tierny Aug 23, 2024
4e90c80
listing conda installation
julien-tierny Aug 23, 2024
89fb0a8
added missing files
julien-tierny Aug 23, 2024
a5f0e06
listing more conda install
julien-tierny Aug 23, 2024
7185d2e
exploring conda install
julien-tierny Aug 23, 2024
6f71b59
try to add libboost-devel
julien-tierny Aug 23, 2024
bf3f48f
searching for conda's boost cmake files
julien-tierny Aug 23, 2024
ee93f4f
simpler windows CI fix
julien-tierny Aug 23, 2024
6f386fd
fix refactoring
julien-tierny Aug 23, 2024
0aba906
removed unnecessary headers
julien-tierny Aug 23, 2024
0a05316
updated var names
julien-tierny Aug 23, 2024
8e40d6c
remvod comments
julien-tierny Aug 23, 2024
b61af7a
fixed vtk layer
julien-tierny Aug 23, 2024
e5a5e41
used proper indices, removed unused functions
julien-tierny Aug 23, 2024
42774bc
updated var names
julien-tierny Aug 23, 2024
8f464af
typo fix
julien-tierny Aug 23, 2024
a4ff012
updated paper references
julien-tierny Aug 23, 2024
c2903bf
Removed getNeighborsIndices function and updated dataVector type to d…
MohamedKISSI Aug 24, 2024
2736f5d
Merge branch 'dev' of https://github.com/topology-tool-kit/ttk into t…
julien-tierny Aug 26, 2024
a1e9c37
clang-format
julien-tierny Aug 26, 2024
a734bca
removed unnecessary headers
julien-tierny Aug 26, 2024
1c17ea6
Use double format for dataVectors and computations, ensure consistenc…
MohamedKISSI Aug 28, 2024
fbd2e90
Solving problems by normalizing the values ​​of the critical points o…
MohamedKISSI Aug 29, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ jobs:
- name: Create & configure TTK build directory
shell: cmd
run: |
set CMAKE_PREFIX_PATH=%CONDA_ROOT%\Library\lib\cmake;%CONDA_ROOT%\Library\share\eigen3\cmake;%CONDA_ROOT%\Library\share\Qull\cmake;%CONDA_ROOT%\Library\cmake;%ProgramFiles%\TTK-ParaView\lib\cmake
set CMAKE_PREFIX_PATH=%CONDA_ROOT%\Library\lib\cmake;%CONDA_ROOT%\Library\share\eigen3\cmake;%CONDA_ROOT%\Library\share\Qull\cmake;%CONDA_ROOT%\Library\cmake;%ProgramFiles%\TTK-ParaView\lib\cmake;
set CC=clang-cl.exe
set CXX=clang-cl.exe
call "%ProgramFiles%\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,46 @@ namespace ttk {
return this->distances;
}

void setTimeLimit(double timeLimit) {
this->TimeLimit = timeLimit;
}

void setForceUseOfAlgorithm(bool forceUseOfAlgorithm) {
this->ForceUseOfAlgorithm = forceUseOfAlgorithm;
}

void setDeltaLim(double DeltaLimNew) {
this->DeltaLim = DeltaLimNew;
}

void setUseAdditionalPrecision(bool Precision) {
this->UseAdditionalPrecision = Precision;
}

void setUseProgressive(bool UseProgressive_) {
this->UseProgressive = UseProgressive_;
}

void setUseInterruptible(bool UseInterruptible_) {
this->UseInterruptible = UseInterruptible_;
}

void setDeterministic(bool Deterministic_) {
this->Deterministic = Deterministic_;
}

void setAlpha(double Alpha_) {
this->Alpha = Alpha_;
}

void setUseAccelerated(bool UseAccelerated_) {
this->UseAccelerated = UseAccelerated_;
}

void setUseKmeansppInit(bool UseKmeansppInit_) {
this->UseKmeansppInit = UseKmeansppInit_;
}

protected:
// Critical pairs used for clustering
// 0:min-saddles ; 1:saddles-saddles ; 2:sad-max ; else : all
Expand Down
17 changes: 17 additions & 0 deletions core/base/topologicalOptimization/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
ttk_add_base_library(topologicalOptimization
SOURCES
TopologicalOptimization.cpp
HEADERS
TopologicalOptimization.h
DEPENDS
triangulation
persistenceDiagram
persistenceDiagramClustering
)

if(TTK_ENABLE_TORCH)
target_include_directories(topologicalOptimization PUBLIC ${TORCH_INCLUDE_DIRS})
target_compile_options(topologicalOptimization PUBLIC "${TORCH_CXX_FLAGS}")
target_link_libraries(topologicalOptimization PUBLIC "${TORCH_LIBRARIES}")
target_compile_definitions(topologicalOptimization PUBLIC TTK_ENABLE_TORCH)
endif()
5 changes: 5 additions & 0 deletions core/base/topologicalOptimization/TopologicalOptimization.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include <TopologicalOptimization.h>

ttk::TopologicalOptimization::TopologicalOptimization() {
this->setDebugMsgPrefix("TopologicalOptimization");
}
Loading
Loading