Parameterization: cleanup #7816

afabri · 2023-10-20T13:52:17Z

Summary of Changes

LSCM parameterization was prepared to fall back to code forked from OpenNL some years back. As it is 10 times slower, we better depend on Eigen just as the other parameterization methods do.

Todo

Currently one file remains, but that fills Eigen matrices and calls an Eigen solver. No need to be in a namespace OpenNL.
cleanup usage.hhml
changes.md

Release Management

Affected package(s): Surface_mesh_parameterization
Issue(s) solved (if any): fix Non existing link to open numerical library #7772
Link to compiled documentation (obligatory for small feature) wrong link name to be changed
License and copyright ownership: unchanged

Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/LSCM_parameterizer_3.h

albert-github

I can see that the file linear_solver.h contains still some non OpenNL related information.
Why isn't this file moved away from here and isn't the complete OpenNL directory removed?

afabri · 2023-10-20T15:48:49Z

I can see that the file linear_solver.h contains still some non OpenNL related information. Why isn't this file moved away from here and isn't the complete OpenNL directory removed?

That is the first Todo. Be patient.

sloriot · 2023-11-02T08:16:03Z

Successfully tested in CGAL-6.0-Ic-96

lrineau · 2023-11-02T09:13:42Z

@afabri This PR is tested, but there is still a TODO entry.

Currently one file remains, but that fills Eigen matrices and calls an Eigen solver. No need to be in a namespace OpenNL.

Is that something you plan to do?

afabri · 2023-11-02T09:20:09Z

@afabri This PR is tested, but there is still a TODO entry.

Currently one file remains, but that fills Eigen matrices and calls an Eigen solver. No need to be in a namespace OpenNL.

Is that something you plan to do?

yes

albert-github

On the risk of being impatient...

I still see the word OpenNL (in different iform of lower / upper case) still in a number of files a.o.:

Installation/LICENSE
Maintenance/deb/sid/debian/copyright
Maintenance/deb/squeeze/debian/copyright
Maintenance/deb/wheezy/debian/copyright
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1/CMakeCache.txt
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O2/CMakeCache.txt
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/i686_Linux-2.6_g++-4.1.2_CentOS-5.1-O3/CMakeCache.txt
Maintenance/infrastructure/cgal.geometryfactory.com/reference-platforms/x86_64_Linux-x.y_IntelCompiler-15.0_CentOS-7.x/CMakeCache.txt
Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release/CMakeCache.txt
Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.0_Release-cpp11/CMakeCache.txt
Maintenance/infrastructure/magritte.geometryfactory.com/reference_platforms/x86-64_Darwin-13.0_Apple-clang-5.1_Release-LEDA-without-GMP/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.5-branch_CXX0X/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.5-branch_Release/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_ansi/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXX0X/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_CXXDEBUG/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_m32/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_MATCHING-BUG-6/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_Release/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-4.8_Release-LEDA/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_g++-trunk_CXX0X/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_IntelCompiler-14.0-with-g++-4.8-STL/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_IntelCompiler-14.0-with-g++-4.8-STL_strict-ansi/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora19_llvm-clang-with-g++-4.8/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora_IntelCompiler-17/CMakeCache.txt
Maintenance/infrastructure/renoir.geometryfactory.com/reference-platforms/x86-64_Linux-Fedora_IntelCompiler-17-with-assertions/CMakeCache.txt
Scripts/developer_scripts/check_licenses
Scripts/scripts/cgal_create_CMakeLists
  in comment
Solver_interface/doc/Solver_interface/Solver_interface.txt
Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
  a bit dubious as it is now removed again, maybe an extra remark that it has been removed as of ...

Documentation/doc/resources/1.8.13/BaseDoxyfile.in

afabri · 2023-11-14T13:43:06Z

I left the files in the directory Maintenance unchanged. @lrineau is that ok?

afabri · 2023-11-14T13:44:08Z

Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
a bit dubious as it is now removed again, maybe an extra remark that it has been removed as of ...

I added a sentence that it was later removed.

...ce_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt

sloriot · 2023-11-29T08:03:13Z

Successfully tested in CGAL-6.0-Ic-116

github-actions · 2023-11-29T15:35:15Z

This pull-request was previously marked with the label Tested, but has been modified with new commits. That label has been removed.

I checked the compilation of the documentation locally.

github-actions · 2023-11-29T15:40:29Z

This pull-request was previously marked with the label Tested, but has been modified with new commits. That label has been removed.

lrineau · 2023-11-29T15:41:28Z

I left the files in the directory Maintenance unchanged. @lrineau is that ok?

I removed them in a later commit (c19cd15).

lrineau · 2023-11-29T15:42:28Z

Here are the last occurrences of opennl in CGAL:

[lrineau@fernand]~/Git/cgal-master% ack opennl -i  ^build*                                
Installation/CHANGES.md
2477:-   `LSCM_parameterizer_3` now uses by default Eigen instead of OpenNL
4725:    Added Jacobi and SSOR preconditioners to OpenNL solver, which makes

Solver_interface/doc/Solver_interface/Solver_interface.txt
128:on \taucs, \lapack, \blas and OpenNL. Gaël Guennebaud

Surface_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt
537:Pierre Alliez and Bruno Lévy. Bruno Lévy added OpenNL support to the package.
550:In CGAL 6.0 this package no longer uses the fork of OpenNL that was distributed with CGAL

so:

the changelog,
and two "history" sections in the manual.

Thas is okay.

# Conflicts: # Installation/LICENSE

afabri added 3 commits October 20, 2023 14:44

Parameterization: cleanup

86502db

Cleanup of Usage.txt

f3d08ef

Add to changes.md

f1fda7b

afabri added this to the 6.0-beta milestone Oct 20, 2023

afabri added Ready to be tested Cleaning Pkg::Surface_mesh_parametrization labels Oct 20, 2023

albert-github reviewed Oct 20, 2023

View reviewed changes

Surface_mesh_parameterization/include/CGAL/Surface_mesh_parameterization/LSCM_parameterizer_3.h Show resolved Hide resolved

static_assert

c4270c6

albert-github reviewed Oct 20, 2023

View reviewed changes

sloriot added Batch_1 First Batch of PRs under testing Under Testing and removed Batch_1 First Batch of PRs under testing labels Oct 24, 2023

sloriot added Tested and removed Ready to be tested Under Testing labels Nov 2, 2023

lrineau added the TODO label Nov 2, 2023

MaelRL removed the Tested label Nov 2, 2023

MaelRL and others added 3 commits November 2, 2023 11:14

Do not rely on OpenNL's linear solver

18c6d23

cleanup

a77d8b3

Remove very old test platforms, revealed bry grep OpenNL

da1fd6e

sloriot added the Batch_2 Second Batch of PRs under testing label Nov 9, 2023

afabri removed the TODO label Nov 13, 2023

albert-github reviewed Nov 13, 2023

View reviewed changes

Documentation/doc/resources/1.8.13/BaseDoxyfile.in Show resolved Hide resolved

more cleanup

59af92c

albert-github reviewed Nov 14, 2023

View reviewed changes

...ce_mesh_parameterization/doc/Surface_mesh_parameterization/Surface_mesh_parameterization.txt Outdated Show resolved Hide resolved

afabri and others added 2 commits November 14, 2023 13:49

Improve wording

d840b6f

Merge branch 'master' into Parameterization-no_opennl-GF

ba46b78

sloriot added Under Testing and removed Batch_2 Second Batch of PRs under testing labels Nov 21, 2023

sloriot added Tested and removed Under Testing labels Nov 29, 2023

lrineau added 2 commits November 29, 2023 16:34

Remove old infra backups

a64cb2e

extra cleanups

c19cd15

github-actions bot removed the Tested label Nov 29, 2023

lrineau added rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' Tested labels Nov 29, 2023

remove opennl from Doxygen config

3695892

I checked the compilation of the documentation locally.

github-actions bot removed the Tested label Nov 29, 2023

Merge remote-tracking branch 'cgal/master' into pr/afabri/7816

fdcc7c7

# Conflicts: # Installation/LICENSE

lrineau self-assigned this Nov 29, 2023

lrineau merged commit 23e3648 into CGAL:master Nov 29, 2023
9 checks passed

lrineau removed the rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' label Nov 30, 2023

lrineau deleted the Parameterization-no_opennl-GF branch November 30, 2023 08:58

lrineau added the Merged_in_6.0 label Oct 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Parameterization: cleanup #7816

Parameterization: cleanup #7816

afabri commented Oct 20, 2023 •

edited

Loading

albert-github left a comment

afabri commented Oct 20, 2023

sloriot commented Nov 2, 2023

lrineau commented Nov 2, 2023

afabri commented Nov 2, 2023

albert-github left a comment •

edited

Loading

afabri commented Nov 14, 2023

afabri commented Nov 14, 2023

sloriot commented Nov 29, 2023

github-actions bot commented Nov 29, 2023

github-actions bot commented Nov 29, 2023

lrineau commented Nov 29, 2023

lrineau commented Nov 29, 2023

Parameterization: cleanup #7816

Parameterization: cleanup #7816

Conversation

afabri commented Oct 20, 2023 • edited Loading

Summary of Changes

Todo

Release Management

albert-github left a comment

Choose a reason for hiding this comment

afabri commented Oct 20, 2023

sloriot commented Nov 2, 2023

lrineau commented Nov 2, 2023

afabri commented Nov 2, 2023

albert-github left a comment • edited Loading

Choose a reason for hiding this comment

afabri commented Nov 14, 2023

afabri commented Nov 14, 2023

sloriot commented Nov 29, 2023

github-actions bot commented Nov 29, 2023

github-actions bot commented Nov 29, 2023

lrineau commented Nov 29, 2023

lrineau commented Nov 29, 2023

afabri commented Oct 20, 2023 •

edited

Loading

albert-github left a comment •

edited

Loading