From b107f475afc7ecfff20643b54a19ec0b3733d868 Mon Sep 17 00:00:00 2001 From: dongjiao_joan Date: Mon, 29 Jul 2024 12:59:20 +0800 Subject: [PATCH] fix-skopt.Optimizer-incompatible-with-numpy-1.24 --- ...timizer-incompatible-with-numpy-1.24.patch | 25 +++++++++++++++++++ atune.spec | 7 +++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-fix-skopt.Optimizer-incompatible-with-numpy-1.24.patch diff --git a/0001-fix-skopt.Optimizer-incompatible-with-numpy-1.24.patch b/0001-fix-skopt.Optimizer-incompatible-with-numpy-1.24.patch new file mode 100644 index 0000000..4c28338 --- /dev/null +++ b/0001-fix-skopt.Optimizer-incompatible-with-numpy-1.24.patch @@ -0,0 +1,25 @@ +From e755095a5d32688e28edf708aa6fc77e0b978896 Mon Sep 17 00:00:00 2001 +From: dongjiao_joan +Date: Wed, 24 Jul 2024 16:04:49 +0800 +Subject: [PATCH] fix skopt.Optimizer incompatible with numpy 1.24 + +--- + analysis/optimizer/optimizer.py | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/analysis/optimizer/optimizer.py b/analysis/optimizer/optimizer.py +index 4afa8e4..4c5f6b7 100755 +--- a/analysis/optimizer/optimizer.py ++++ b/analysis/optimizer/optimizer.py +@@ -36,6 +36,8 @@ from analysis.optimizer.variance_reduction_feature_selector import VarianceReduc + + LOGGER = logging.getLogger(__name__) + ++# skopt.Optimizer incompatible with numpy >=1.24 ,avoid error : use int replace np.int ++np.int = int + + class Optimizer(multiprocessing.Process): + """find optimal settings and generate optimized profile""" +-- +2.43.0 + diff --git a/atune.spec b/atune.spec index 17d3048..4698289 100755 --- a/atune.spec +++ b/atune.spec @@ -3,7 +3,7 @@ Summary: AI auto tuning system Name: atune Version: 1.2.0 -Release: 2 +Release: 3 License: MulanPSL-2.0 URL: https://gitee.com/openeuler/A-Tune Source: https://gitee.com/openeuler/A-Tune/repository/archive/v%{version}.tar.gz @@ -14,6 +14,7 @@ Patch9002: remove-the-installation-of-atune-ui-related-files.patch Patch9003: adjust-the-startup-sequence-of-atune-rest.patch Patch9004: import-os-for-app.py.patch Patch9005: adapt-sqlite-3.42-to-resolve-the-build-failure.patch +Patch9006: 0001-fix-skopt.Optimizer-incompatible-with-numpy-1.24.patch BuildRequires: rpm-build golang-bin procps-ng BuildRequires: sqlite >= 3.24.0 openssl @@ -90,6 +91,7 @@ atune restful api for manage atuned AI tuning system. %patch9003 -p1 %patch9004 -p1 %patch9005 -p1 +%patch9006 -p1 %build %make_build @@ -190,6 +192,9 @@ atune restful api for manage atuned AI tuning system. %exclude /etc/atuned/rest_certs %changelog +* Mon Jul 29 2024 dongjiao - 1.2.0-3 +- fix skopt.Optimizer incompatible with numpy-1.24 + * Mon Mar 11 2024 zhoupengcheng - 1.2.0-2 - add import and fix build failure