From d22a610545700e74973c01edc9990f4221c0aa17 Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:35:29 +0300 Subject: [PATCH 1/9] test compiler --- src/openfhe_julia.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/openfhe_julia.cpp b/src/openfhe_julia.cpp index 2714dda..b16402f 100644 --- a/src/openfhe_julia.cpp +++ b/src/openfhe_julia.cpp @@ -77,4 +77,3 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& mod) { wrap_GenCryptoContext(mod); wrap_auxiliary(mod); } - From 2986ca8d08313f41e3fc7a72a7357d1abf024a90 Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:41:06 +0300 Subject: [PATCH 2/9] do not retrieve from cache --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 322eea0..81814ab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -88,7 +88,6 @@ jobs: path: openfhe-development/ key: ${{ matrix.os }}-openfhe-v${{ env.OPENFHE_VERSION }} - name: Install OpenFHE - if: steps.cache-openfhe.outputs.cache-hit != 'true' run: | rm -rf openfhe-development mkdir -p openfhe-development From 766ca2d59f0ce53535889611dadc9644d875ae09 Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:50:21 +0300 Subject: [PATCH 3/9] fix gcc to v13 on windows --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81814ab..d5c3dfc 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,7 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.9' + compiler: "GCC-13" - os: ubuntu-latest shell: bash julia_version: '1.10' @@ -56,6 +57,7 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.10' + compiler: "GCC-13" # Set default shell as suggested here: https://github.community/t/setting-default-shell-or-other-step-metadata-conditionally-in-workflows/154055 defaults: run: From c90766a726302b96c836168eefee9e06a743172b Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 12:57:12 +0300 Subject: [PATCH 4/9] another try --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d5c3dfc..5dda8be 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,7 +47,6 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.9' - compiler: "GCC-13" - os: ubuntu-latest shell: bash julia_version: '1.10' @@ -57,7 +56,6 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.10' - compiler: "GCC-13" # Set default shell as suggested here: https://github.community/t/setting-default-shell-or-other-step-metadata-conditionally-in-workflows/154055 defaults: run: @@ -70,6 +68,7 @@ jobs: with: update: true install: git base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake + compiler: "GCC-13" - name: Install OpenMP if: ${{ matrix.os == 'macos-latest' }} run: | From 5a83bf4632a608a03649c755e54e2833e8a94ce9 Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 17:06:28 +0300 Subject: [PATCH 5/9] another try --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5dda8be..24ba7ee 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,6 +47,8 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.9' + compiler: gcc + gcc: 13 - os: ubuntu-latest shell: bash julia_version: '1.10' @@ -56,6 +58,8 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.10' + compiler: gcc + gcc: 13 # Set default shell as suggested here: https://github.community/t/setting-default-shell-or-other-step-metadata-conditionally-in-workflows/154055 defaults: run: @@ -65,10 +69,12 @@ jobs: uses: actions/checkout@v4 - uses: msys2/setup-msys2@v2 if: ${{ matrix.os == 'windows-latest' }} + env: + CC: gcc-${{ matrix.gcc }} + CXX: g++-${{ matrix.gcc }} with: update: true install: git base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake - compiler: "GCC-13" - name: Install OpenMP if: ${{ matrix.os == 'macos-latest' }} run: | From 063e7dae4dd9e9acde44131f9c5e36e654161b39 Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:10:26 +0300 Subject: [PATCH 6/9] use older msys installer --- .github/workflows/ci.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 24ba7ee..aac0266 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -47,8 +47,6 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.9' - compiler: gcc - gcc: 13 - os: ubuntu-latest shell: bash julia_version: '1.10' @@ -58,8 +56,6 @@ jobs: - os: windows-latest shell: 'msys2 {0}' julia_version: '1.10' - compiler: gcc - gcc: 13 # Set default shell as suggested here: https://github.community/t/setting-default-shell-or-other-step-metadata-conditionally-in-workflows/154055 defaults: run: @@ -67,11 +63,8 @@ jobs: steps: - name: Checkout repository uses: actions/checkout@v4 - - uses: msys2/setup-msys2@v2 + - uses: msys2/setup-msys2@v2.22.0 if: ${{ matrix.os == 'windows-latest' }} - env: - CC: gcc-${{ matrix.gcc }} - CXX: g++-${{ matrix.gcc }} with: update: true install: git base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake From 92331f418a77b7b7e9e05a2f831276ebb9e8d82e Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 18:29:39 +0300 Subject: [PATCH 7/9] do not update msys --- .github/workflows/ci.yml | 3 ++- src/openfhe_julia.cpp | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aac0266..2145cfd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -66,7 +66,7 @@ jobs: - uses: msys2/setup-msys2@v2.22.0 if: ${{ matrix.os == 'windows-latest' }} with: - update: true + update: false install: git base-devel mingw-w64-x86_64-toolchain mingw-w64-x86_64-cmake - name: Install OpenMP if: ${{ matrix.os == 'macos-latest' }} @@ -88,6 +88,7 @@ jobs: path: openfhe-development/ key: ${{ matrix.os }}-openfhe-v${{ env.OPENFHE_VERSION }} - name: Install OpenFHE + if: steps.cache-openfhe.outputs.cache-hit != 'true' run: | rm -rf openfhe-development mkdir -p openfhe-development diff --git a/src/openfhe_julia.cpp b/src/openfhe_julia.cpp index b16402f..2714dda 100644 --- a/src/openfhe_julia.cpp +++ b/src/openfhe_julia.cpp @@ -77,3 +77,4 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& mod) { wrap_GenCryptoContext(mod); wrap_auxiliary(mod); } + From abcc634ecbbecb99dc043161f10b270e0c80f728 Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 20:35:01 +0300 Subject: [PATCH 8/9] set new version of openfhe --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2145cfd..8730e8e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ on: env: # Modify these variables for upstream package versions - do NOT hardcode the version # anywhere else! - OPENFHE_VERSION: '1.1.4' + OPENFHE_VERSION: '1.2.0' LIBCXXWRAP_JULIA_VERSION: '0.12.2' FORCE_CXXWRAP_JL_VERSION: '0.15' # Use only briefly during transition (default: '') From 09e8c1b7ed2a1feef04bff5cc1f5e8f850ac42cc Mon Sep 17 00:00:00 2001 From: ArseniyKholod <119304909+ArseniyKholod@users.noreply.github.com> Date: Wed, 26 Jun 2024 20:42:39 +0300 Subject: [PATCH 9/9] new versions --- .github/workflows/ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8730e8e..c37fe4a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,9 +25,9 @@ on: env: # Modify these variables for upstream package versions - do NOT hardcode the version # anywhere else! - OPENFHE_VERSION: '1.2.0' - LIBCXXWRAP_JULIA_VERSION: '0.12.2' - FORCE_CXXWRAP_JL_VERSION: '0.15' # Use only briefly during transition (default: '') + OPENFHE_VERSION: '1.1.4' + LIBCXXWRAP_JULIA_VERSION: '0.13.0' + FORCE_CXXWRAP_JL_VERSION: '0.16' # Use only briefly during transition (default: '') jobs: test: