Skip to content

Commit

Permalink
Fix config-settings handling in pip install (#9115)
Browse files Browse the repository at this point in the history
* Fix config_settings handling in pip install

* Fix formatting

* Fix flag use_system_libxgboost

* Add setuptools to doc requirements.txt

* Fix mypy
  • Loading branch information
hcho3 authored May 10, 2023
1 parent 09b4491 commit 0cd4382
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/python_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
cd python-package
python --version
python -m build --sdist
pip install -v ./dist/xgboost-*.tar.gz
pip install -v ./dist/xgboost-*.tar.gz --config-settings use_openmp=False
cd ..
python -c 'import xgboost'
Expand Down
3 changes: 2 additions & 1 deletion doc/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ myst-parser
xgboost_ray
sphinx-gallery
pyspark
cloudpickle
cloudpickle
setuptools
11 changes: 3 additions & 8 deletions python-package/packager/build_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,18 @@ class BuildConfiguration: # pylint: disable=R0902
# Special option: See explanation below
use_system_libxgboost: bool = False

def _set_config_setting(
self, config_settings: Dict[str, Any], field_name: str
) -> None:
if field_name in config_settings:
def _set_config_setting(self, config_settings: Dict[str, Any]) -> None:
for field_name in config_settings:
setattr(
self,
field_name,
(config_settings[field_name].lower() in ["true", "1", "on"]),
)
else:
raise ValueError(f"Field {field_name} is not a valid config_settings")

def update(self, config_settings: Optional[Dict[str, Any]]) -> None:
"""Parse config_settings from Pip (or other PEP 517 frontend)"""
if config_settings is not None:
for field_name in [x.name for x in dataclasses.fields(self)]:
self._set_config_setting(config_settings, field_name)
self._set_config_setting(config_settings)

def get_cmake_args(self) -> List[str]:
"""Convert build configuration to CMake args"""
Expand Down
15 changes: 8 additions & 7 deletions python-package/packager/nativelib.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,21 @@ def locate_or_build_libxgboost(
"""Locate libxgboost; if not exist, build it"""
logger = logging.getLogger("xgboost.packager.locate_or_build_libxgboost")

libxgboost = locate_local_libxgboost(toplevel_dir, logger=logger)
if libxgboost is not None:
return libxgboost
if build_config.use_system_libxgboost:
# Find libxgboost from system prefix
sys_prefix = pathlib.Path(sys.prefix).absolute().resolve()
libxgboost = sys_prefix / "lib" / _lib_name()
if not libxgboost.exists():
libxgboost_sys = sys_prefix / "lib" / _lib_name()
if not libxgboost_sys.exists():
raise RuntimeError(
f"use_system_libxgboost was specified but {_lib_name()} is "
f"not found in {libxgboost.parent}"
f"not found in {libxgboost_sys.parent}"
)

logger.info("Using system XGBoost: %s", str(libxgboost))
logger.info("Using system XGBoost: %s", str(libxgboost_sys))
return libxgboost_sys

libxgboost = locate_local_libxgboost(toplevel_dir, logger=logger)
if libxgboost is not None:
return libxgboost

if toplevel_dir.joinpath("cpp_src").exists():
Expand Down
3 changes: 2 additions & 1 deletion python-package/packager/pep517.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ def build_wheel(
libxgboost = locate_or_build_libxgboost(
TOPLEVEL_DIR, build_dir=build_dir, build_config=build_config
)
copy_with_logging(libxgboost, lib_path, logger=logger)
if not build_config.use_system_libxgboost:
copy_with_logging(libxgboost, lib_path, logger=logger)

with cd(workspace):
wheel_name = hatchling.build.build_wheel(
Expand Down

0 comments on commit 0cd4382

Please sign in to comment.