Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aidge_core
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Houssem ROUIS
aidge_core
Commits
0d791d9e
Commit
0d791d9e
authored
1 year ago
by
Grégoire Kubler
Browse files
Options
Downloads
Patches
Plain Diff
fix : python::python not needed (told you so)
parent
c84ff493
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/PybindModuleCreation.cmake
+2
-3
2 additions, 3 deletions
cmake/PybindModuleCreation.cmake
setup.py
+1
-11
1 addition, 11 deletions
setup.py
with
3 additions
and
14 deletions
cmake/PybindModuleCreation.cmake
+
2
−
3
View file @
0d791d9e
...
...
@@ -4,7 +4,7 @@ macro(generate_python_binding )
# Use the New FindPython mode, recommanded. Requires CMake 3.15+
find_package
(
Python 3.7.0
COMPONENTS Interpreter Development.Module
COMPONENTS Interpreter Development.Module
REQUIRED
)
set
(
PYBIND11_FINDPYTHON ON
)
set
(
PYBIND_VERSION v2.10.4
)
...
...
@@ -21,11 +21,10 @@ macro(generate_python_binding )
pybind11_add_module
(
${
project
}
MODULE
${
pybind_src_files
}
"NO_EXTRAS"
)
# NO EXTRA required for pip install
target_include_directories
(
${
project
}
PUBLIC
"python_binding"
${
pybind11_INCLUDE_DIRECTORIES
}
)
# Handles Python + pybind11 headers dependencies
target_link_libraries
(
${
module_name
}
PRIVATE
Python::Module
Python::Module
PUBLIC
pybind11::pybind11
)
...
...
This diff is collapsed.
Click to expand it.
setup.py
+
1
−
11
View file @
0d791d9e
...
...
@@ -46,15 +46,7 @@ class CMakeBuild(build_ext):
# Impose to use the executable of the python
# used to launch setup.py to setup PythonInterp
python_executable
=
sys
.
executable
python_include_dirs
=
sysconfig
.
get_path
(
'
include
'
)
python_library
=
sysconfig
.
get_config_var
(
'
LIBDIR
'
)
python_prefix
=
sys
.
exec_prefix
print
(
f
"
python
\t
executable
\t
{
python_executable
}
"
)
print
(
f
"
\t\t\t
include
\t
dirs
{
python_include_dirs
}
"
)
print
(
f
"
-DPYTHON_INCLUDE_DIRS=
{
sysconfig
.
get_config_var
(
'
INCLUDEPY
'
)
}
"
)
# this might need to be the subdir
print
(
f
"
\t\t\t
library
\t
{
python_library
}
"
)
print
(
f
"
-DPYTHON_LIBRARIES=
{
sysconfig
.
get_config_var
(
'
LIBDEST
'
)
}
"
)
print
(
f
"
\t\t\t
prefix
\t
{
python_prefix
}
"
)
print
(
f
"
python executable :
\t
{
python_executable
}
"
)
compile_type
=
"
Debug
"
install_path
=
(
os
.
path
.
join
(
sys
.
prefix
,
"
lib
"
,
"
libAidge
"
)
...
...
@@ -66,8 +58,6 @@ class CMakeBuild(build_ext):
"
cmake
"
,
str
(
cwd
),
f
"
-DPYTHON_EXECUTABLE=
{
sys
.
executable
}
"
,
f
"
-DPYTHON_INCLUDE_DIRS=
{
sysconfig
.
get_config_var
(
'
INCLUDEPY
'
)
}
"
,
f
"
-DPYTHON_LIBRARIES=
{
sysconfig
.
get_config_var
(
'
LIBDEST
'
)
}
"
,
"
-DTEST=OFF
"
,
f
"
-DCMAKE_INSTALL_PREFIX:PATH=
{
install_path
}
"
,
f
"
-DCMAKE_BUILD_TYPE=
{
compile_type
}
"
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment