From e4b4e335682c5bc3cb34ce968441e0acba199030 Mon Sep 17 00:00:00 2001 From: Jacob Lifshay Date: Tue, 15 Aug 2023 18:56:51 -0700 Subject: [PATCH] fix CI --- .gitlab-ci.yml | 4 +++- README.md | 5 +++++ sfpy.patch | 10 ++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 sfpy.patch diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 526e795b..58b21d4e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -48,13 +48,14 @@ build: - ccache --show-stats || true - python3 -m venv --system-site-packages .venv - . .venv/bin/activate - - pip install pytest-xdist==3.3.1 pytest==7.3.1 twine cython + - pip install pytest-xdist==3.3.1 pytest==7.3.1 script: - . .venv/bin/activate - IEEE754FPU_PATH="$(pwd)" - git clone --depth 1 --recursive -b v0.6.0 https://github.com/billzorn/sfpy.git sfpy - pushd sfpy + - git apply "$IEEE754FPU_PATH"/sfpy.patch - pushd berkeley-softfloat-3 - git apply "$IEEE754FPU_PATH"/berkeley-softfloat.patch - popd @@ -62,6 +63,7 @@ build: - git apply ../softposit_sfpy_build.patch - git apply "$IEEE754FPU_PATH"/SoftPosit.patch - popd + - pip install -r requirements.txt - make lib -j$(nproc) - make cython -j$(nproc) - make wheel -j$(nproc) diff --git a/README.md b/README.md index f7051e1e..12c32140 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,11 @@ IEEE754 FP emulation being tested. This FPU is emulating RISC-V, and there is some weirdness in x86 IEEE754 implementations when it comes to FP16 non-canonical NaNs. +The following modifications are required to sfpy: + + cd /path/to/sfpy + git apply /path/to/ieee754fpu/sfpy.patch + The following modifications are required to the sfpy berkeley-softfloat-3 submodule: diff --git a/sfpy.patch b/sfpy.patch new file mode 100644 index 00000000..4c1014f7 --- /dev/null +++ b/sfpy.patch @@ -0,0 +1,10 @@ +diff --git a/requirements.txt b/requirements.txt +index 41fa4f6..0e9adef 100644 +--- a/requirements.txt ++++ b/requirements.txt +@@ -2,4 +2,4 @@ pip + wheel + twine + keyring +-cython ++cython~=0.29.2 -- 2.30.2