remove numpy

YosysHQ · Feb 16, 2024 · c31692f · c31692f
1 parent 0f320d7
commit c31692f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 21 deletions.
diff --git a/default/rules/nextpnr.py b/default/rules/nextpnr.py
@@ -111,14 +111,6 @@
 	license_file = 'LICENSE',
 )
 
-SourceLocation(
-	name = 'numpy',
-	vcs = 'git',
-	location = 'https://github.com/numpy/numpy',
-	revision = 'tags/v1.26.3',
-	license_file = 'LICENSE.txt',
-)
-
 Target(
 	name = 'icestorm',
 	sources = [ 'icestorm' ],
@@ -140,18 +132,9 @@
 Target(
 	name = 'apicula',
 	sources = [ 'apicula' ],
-	dependencies = [ 'python3', 'python3-native', 'numpy' ],
-	resources = [ 'python3', 'numpy' ],
-	package = 'gowin',
-	arch = [ 'linux-x64', 'linux-arm64', 'darwin-x64', 'darwin-arm64' ],
-)
-
-Target(
-	name = 'numpy',
-	sources = [ 'numpy' ],
 	dependencies = [ 'python3', 'python3-native' ],
 	resources = [ 'python3' ],
-	arch = [ 'linux-x64', 'linux-arm64', 'darwin-x64', 'darwin-arm64' ],
+	package = 'gowin',
 )
 
 # chip databases
@@ -182,7 +165,7 @@
 Target(
 	name = 'apicula-bba',
 	sources = [ 'nextpnr' ],
-	dependencies = [ 'apicula', 'python3-native', 'numpy' ],
+	dependencies = [ 'apicula', 'python3-native' ],
 	gitrev = [ ('nextpnr', 'gowin') ],
 	build_native = True,
 )
diff --git a/default/scripts/apicula-bba.sh b/default/scripts/apicula-bba.sh
@@ -1,6 +1,5 @@
 pushd nextpnr/gowin
 sed -i 's,/work/_builds/linux-x64/apicula/python3-native/yosyshq/bin/python3.11,/work/_builds/linux-x64/apicula-bba/python3-native/yosyshq/bin/python3.11,g' ${BUILD_DIR}/apicula/${INSTALL_PREFIX}/bin/gowin_bba
-cp -R ${BUILD_DIR}/numpy${INSTALL_PREFIX}/lib/python3.11/site-packages/* ${BUILD_DIR}/python3-native${INSTALL_PREFIX}/lib/python3.11/site-packages/.
 cp -R ${BUILD_DIR}/apicula${INSTALL_PREFIX}/lib/python3.11/site-packages/*  ${BUILD_DIR}/python3-native${INSTALL_PREFIX}/lib/python3.11/site-packages/.
 cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} \
       -DGOWIN_BBA_EXECUTABLE=${BUILD_DIR}/apicula/${INSTALL_PREFIX}/bin/gowin_bba \

diff --git a/default/scripts/apicula.sh b/default/scripts/apicula.sh
@@ -1,6 +1,5 @@
 cd apicula
 source ${PATCHES_DIR}/python3_package.sh
-cp -R ${BUILD_DIR}/numpy${INSTALL_PREFIX}/lib/python3.11/site-packages/* ${BUILD_DIR}/python3${INSTALL_PREFIX}/lib/python3.11/site-packages/.
 python3_package_setup
 python3_package_pip_install "crcmod"
 curl -L https://github.com/YosysHQ/apicula/releases/download/0.0.0.dev/linux-x64-gowin-data.tgz > linux-x64-gowin-data.tgz