-
Notifications
You must be signed in to change notification settings - Fork 65
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
Use Cgal and Eigen3 cmake target #1049
Conversation
…h cmake as only one main is necessary
Does it not even help if we have tests with the same name in 2 subprojects, or something like that? Anyway, whatever you prefer.
I would say no. The code still works with older versions, it is only the cmake stuff that breaks.
Yes please. I remember discussing this issue a while ago, but I don't know with whom... |
From what I read here:
As all of our code managed by CMake is C++, with the same gudhi version number, cmake minimal version is the same for all the library (easier to maintain),... I prefer to keep one project. |
@@ -8,7 +8,7 @@ | |||
| | diagonal points) such that any couple of matched points are at | | | |||
| Bottleneck distance is the length of | distance at most b, where the distance between points is the sup | :License: MIT (`GPL v3 </licensing/>`_) | | |||
| the longest edge | norm in :math:`\mathbb{R}^2`. | | | |||
| | | :Requires: `CGAL <installation.html#cgal>`_ :math:`\geq` 4.11.0 | | |||
| | | :Requires: `CGAL <installation.html#cgal>`_ :math:`\geq` 5.1.0 | |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know if having the version number repeated everywhere is that useful (it isn't horrible though). A possibility would be to specify it only when it isn't the "default" one.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is the tensorflow stuff in this unrelated PR?
IIUC, dynamic=True
is now always enabled so they removed the option? The approach looks ok then.
# The sklearn parse_version function is taken from 'packaging' and this dependency is not mandatory | ||
from sklearn.utils.fixes import parse_version |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure what the comment means.
Do we now need to install sklearn to be able to use the tensorflow stuff?
""" | ||
Constructor for the TensorflowKerasLayer class | ||
""" | ||
# On tensorflow < 2.15.1 set dynamic argument to True |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did they really change that in a patch release, i.e. 2.15.0 wants dynamic
but 2.15.1 rejects it? That's surprising 😞
Sorry about that bad merge... I start again a new PR from 96f7508 and I close this one. |
This PR is required by future CGAL 6.0
add_executable
andtarget_link_libraries
with CMake targets in a new functionadd_executable_with_targets
project
from each CMake (just keep the main one) as not mandatory and it does not add any functionalityquestions ❓
* [ ] Do we update CGAL_VERSION_NR and EIGEN_VERSION_AT_LEAST check in code ?find_package(CGAL 5.1.0)
does not work with CGAL master (but 6.0.X). Do we open an issue on CGAL side ? CMake find_package with a minimal CGAL version number does not detect properly 6.X CGAL version CGAL/cgal#8192