From 9a7bc099a8042c233458c09a2fd87206a3be854c Mon Sep 17 00:00:00 2001
From: Siyuan Zhang <siyuanzhang.zsy@alibaba-inc.com>
Date: Thu, 23 Mar 2023 19:15:06 +0800
Subject: [PATCH] Make wheel name depends on platform name (#2551)

---
 Makefile              | 12 +++++-------
 coordinator/setup.py  |  2 ++
 k8s/internal/Makefile | 17 ++++++++++-------
 python/setup.py       |  3 ++-
 4 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index ea7de99224d0..c581535b3ca9 100644
--- a/Makefile
+++ b/Makefile
@@ -42,13 +42,6 @@ all: learning client coordinator analytical interactive
 graphscope: all
 
 install: analytical-install interactive-install learning-install client coordinator
-    # client
-	pip3 install --user --editable $(CLIENT_DIR)
-	rm -rf $(CLIENT_DIR)/*.egg-info
-    # coordinator
-	pip3 install --user --editable $(COORDINATOR_DIR)
-	rm -rf $(COORDINATOR_DIR)/*.egg-info
-
 	echo "Run the following command to correctly set environment variable"
 	echo "export GRAPHSCOPE_HOME=$(INSTALL_PREFIX)"
 
@@ -61,6 +54,7 @@ clean:
 	rm -rf $(INTERACTIVE_DIR)/executor/ir/target
 
 	rm -rf $(LEARNING_BUILD_DIR) $(LEARNING_DIR)/proto/*.h $(LEARNING_DIR)/proto/*.cc
+	rm -rf $(LEARNING_DIR)/graphlearn/built
 
 	cd $(CLIENT_DIR) && python3 setup.py clean --all
 
@@ -74,11 +68,15 @@ client: learning
 	cd $(CLIENT_DIR) && \
 	pip3 install -r requirements.txt -r requirements-dev.txt --user && \
 	python3 setup.py build_ext --inplace --user
+	pip3 install --user --editable $(CLIENT_DIR)
+	rm -rf $(CLIENT_DIR)/*.egg-info
 
 coordinator: client
 	cd $(COORDINATOR_DIR) && \
 	pip3 install -r requirements.txt -r requirements-dev.txt --user && \
 	python3 setup.py build_builtin
+	pip3 install --user --editable $(COORDINATOR_DIR)
+	rm -rf $(COORDINATOR_DIR)/*.egg-info
 
 # We deliberately make $(ENGINE) depends on a file, and $(ENGINE)-install depends on $(ENGINE),
 # so that when we execute `make $(ENGINE)-install` after `make $(ENGINE)`, it will not
diff --git a/coordinator/setup.py b/coordinator/setup.py
index 186602966f16..ca02242956bb 100644
--- a/coordinator/setup.py
+++ b/coordinator/setup.py
@@ -372,6 +372,8 @@ def parse_version(root, **kwargs):
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     keywords="GraphScope, Graph Computations",
     use_scm_version={
diff --git a/k8s/internal/Makefile b/k8s/internal/Makefile
index 5d1023cfc73d..604bf0e33a9b 100644
--- a/k8s/internal/Makefile
+++ b/k8s/internal/Makefile
@@ -17,6 +17,9 @@ ifeq ($(UNAME_S), Linux)
 	XARGS_EMPTY_FLAG := --no-run-if-empty
 endif
 
+# x86_64 or arm64
+ARCH := $(shell uname -m)
+
 BUILD_PROGRESS    = auto
 
 # Default null
@@ -84,15 +87,15 @@ graphscope-darwin-py3:
 		sudo strip ${INSTALL_PREFIX}/bin/gaia_executor && \
 		export DYLD_LIBRARY_PATH=/usr/local/lib:$$DYLD_LIBRARY_PATH && \
 		install_name_tool -add_rpath /usr/local/lib ${INSTALL_PREFIX}/bin/gaia_executor && \
-		package_name=gs-include python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
+		package_name=gs-include python3 setup.py bdist_wheel --plat=macosx_10_9_${ARCH} && \
 		rm -rf build && \
-		package_name=gs-apps python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
+		package_name=gs-apps python3 setup.py bdist_wheel --plat=macosx_10_9_${ARCH} && \
 		rm -rf build && \
-		package_name=gs-engine python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
+		package_name=gs-engine python3 setup.py bdist_wheel --plat=macosx_10_9_${ARCH} && \
 		rm -rf build && \
-		package_name=gs-coordinator python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
+		package_name=gs-coordinator python3 setup.py bdist_wheel --plat=macosx_10_9_${ARCH} && \
 		rm -rf build && \
-		package_name=graphscope python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
+		package_name=graphscope python3 setup.py bdist_wheel --plat=macosx_10_9_${ARCH} && \
 		pip3 install delocate && \
 		for wheel in `ls dist/*.whl`; do \
 			delocate-listdeps -a -d $$wheel; \
@@ -125,7 +128,7 @@ graphscope-manylinux2014-py3-nodocker:
 	package_name=graphscope python3 setup.py bdist_wheel && \
 	cd dist && \
 	for wheel in `ls ./*.whl`; do \
-		(auditwheel repair $$wheel --plat=manylinux2014_x86_64 && rm $$wheel) || true; \
+		(auditwheel repair $$wheel --plat=manylinux2014_${ARCH} && rm $$wheel) || true; \
 	done
 
 graphscope-manylinux2014-py3:
@@ -191,7 +194,7 @@ graphscope-client-darwin-py3:
 			pip3 install "numpy==1.18.5" "pandas" "grpcio<=1.43.0,>=1.40.0" "grpcio-tools<=1.43.0,>=1.40.0" delocate wheel; \
 		fi; \
 		rm -rf build dist/*.whl || true && \
-		python3 setup.py bdist_wheel --plat=macosx_10_9_x86_64 && \
+		python3 setup.py bdist_wheel --plat=macosx_10_9_${ARCH} && \
 		for wheel in `ls dist/*.whl`; do \
 			delocate-wheel -w dist/wheelhouse -v $$wheel && rm $$wheel; \
 		done
diff --git a/python/setup.py b/python/setup.py
index 595cdbd50db5..8fdc2c353733 100644
--- a/python/setup.py
+++ b/python/setup.py
@@ -281,10 +281,11 @@ def parse_version(root, **kwargs):
         "Operating System :: POSIX",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
     ],
     keywords="Graph, Large-Scale, Distributed Computing",
     use_scm_version={