Skip to content

Commit b8687d9

Browse files
qunaibittimfel
authored andcommitted
[GR-49695] Update tensorflow patch update and meson fix
PullRequest: graalpython/3107
2 parents 6748f57 + 47cd298 commit b8687d9

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

graalpython/lib-graalpython/_sysconfig.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,14 @@ def _get_posix_vars():
9999
if darwin_native:
100100
g['LDSHARED'] = get_toolchain('CC') + " -bundle -undefined dynamic_lookup"
101101
g['LDFLAGS'] = "-bundle -undefined dynamic_lookup"
102+
g['LIBPYTHON'] = ''
102103
elif win32_native:
103104
g['LDFLAGS'] = f"-L{__graalpython__.capi_home.replace(os.path.sep, '/')}"
104105
g['LDSHARED_WINDOWS'] = f"{g['LDSHARED_LINUX']} {g['LDFLAGS']}"
105106
g['LDSHARED'] = g['LDSHARED_WINDOWS']
106107
else:
107108
g['LDSHARED'] = g['LDSHARED_LINUX']
109+
g['LIBPYTHON'] = ''
108110
g['SOABI'] = so_abi
109111
g['EXT_SUFFIX'] = "." + so_abi + so_ext
110112
g['SHLIB_SUFFIX'] = so_ext

graalpython/lib-graalpython/patches/tensorflow/tensorflow-2.15.0.patch

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1d68111b71462e8f15daa93eee333a4329db0b5d Mon Sep 17 00:00:00 2001
1+
From b19d1322b2a266fc98bb01939cca615ed2ccdab8 Mon Sep 17 00:00:00 2001
22
From: Mohaned Qunaibit <mohaned.qunaibit@oracle.com>
33
Date: Tue, 5 Dec 2023 02:13:43 +0300
44
Subject: [PATCH] patch for tensorflow 2.15
@@ -444,7 +444,7 @@ index 00000000000..2fda834f065
444444
+backend-path = ["."]
445445
diff --git a/requirements_graalpy.txt b/requirements_graalpy.txt
446446
new file mode 100644
447-
index 00000000000..7b97c94f958
447+
index 00000000000..262b347bd3d
448448
--- /dev/null
449449
+++ b/requirements_graalpy.txt
450450
@@ -0,0 +1,44 @@
@@ -461,7 +461,7 @@ index 00000000000..7b97c94f958
461461
+portpicker==1.5.2
462462
+tensorflow-estimator==2.15.0
463463
+requests==2.31.0
464-
+psutil==5.9.5
464+
+psutil==5.9.6
465465
+charset-normalizer==3.1.0
466466
+google-auth-oauthlib==1.0.0
467467
+protobuf==4.23.4
@@ -1099,7 +1099,7 @@ index 8601192edf7..e7f5a033af9 100644
10991099
# LINT.IfChange
11001100
diff --git a/tf_build_backend.py b/tf_build_backend.py
11011101
new file mode 100644
1102-
index 00000000000..29b5295b06f
1102+
index 00000000000..a8f8ca74729
11031103
--- /dev/null
11041104
+++ b/tf_build_backend.py
11051105
@@ -0,0 +1,62 @@
@@ -1131,7 +1131,7 @@ index 00000000000..29b5295b06f
11311131
+ return env
11321132
+
11331133
+def build_sdist(sdist_directory, config_settings=None):
1134-
+ nv = 'tensorflow-2.14.0'
1134+
+ nv = 'tensorflow-2.15.0'
11351135
+ archive_path = Path(sdist_directory) / f'{nv}.tar.gz'
11361136
+
11371137
+ def tarfilter(info):
@@ -1151,7 +1151,7 @@ index 00000000000..29b5295b06f
11511151
+ str(SUB_VENV_PYTHON),
11521152
+ 'graalpy_build.py',
11531153
+ '--no-install',
1154-
+ '--no-pipreq',
1154+
+ # '--no-pipreq',
11551155
+ '--sites', os.pathsep.join(site.getsitepackages()),
11561156
+ '--whl-path', d,
11571157
+ ], env=setup_venv(), check=True)

0 commit comments

Comments
 (0)