Skip to content

Commit 866d832

Browse files
ladnirladnir
committed
mac ci debug
1 parent 7ee0cda commit 866d832

File tree

2 files changed

+145
-148
lines changed

2 files changed

+145
-148
lines changed

‎.github/workflows/build-test.yml

+143-143
Original file line numberDiff line numberDiff line change
@@ -16,121 +16,121 @@ on:
1616
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1717
jobs:
1818
# This workflow contains a single job called "build"
19-
build-ubuntu:
20-
# The type of runner that the job will run on
21-
runs-on: ubuntu-latest
22-
timeout-minutes: 30
23-
24-
# Steps represent a sequence of tasks that will be executed as part of the job
25-
steps:
26-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
27-
- uses: actions/checkout@v2
28-
with:
29-
submodules: recursive
30-
31-
# Runs a set of commands using the runners shell
19+
# build-ubuntu:
20+
# # The type of runner that the job will run on
21+
# runs-on: ubuntu-latest
22+
# timeout-minutes: 30
23+
24+
# # Steps represent a sequence of tasks that will be executed as part of the job
25+
# steps:
26+
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
27+
# - uses: actions/checkout@v2
28+
# with:
29+
# submodules: recursive
30+
31+
# # Runs a set of commands using the runners shell
3232

33-
#- name: build relic
34-
# run: python3 build.py -DENABLE_BOOST=OFF -DENABLE_SODIUM=OFF -DENABLE_ASAN=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
33+
# #- name: build relic
34+
# # run: python3 build.py -DENABLE_BOOST=OFF -DENABLE_SODIUM=OFF -DENABLE_ASAN=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
3535

36-
#- name: build bitpolymul
37-
# run: python3 build.py --bitpolymul --par=4 -DVERBOSE_FETCH=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
36+
# #- name: build bitpolymul
37+
# # run: python3 build.py --bitpolymul --par=4 -DVERBOSE_FETCH=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
3838

39-
- name: build libOTe
40-
run: python3 build.py --par=4 -D ENABLE_ALL_OT=ON -DENABLE_CIRCUITS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_ASAN=ON -DENABLE_MOCK_OT=true
39+
# - name: build libOTe
40+
# run: python3 build.py --par=4 -D ENABLE_ALL_OT=ON -DENABLE_CIRCUITS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_ASAN=ON -DENABLE_MOCK_OT=true
4141

42-
- name: unit tests
43-
run: |
44-
./out/build/linux/frontend/frontend_libOTe -u
42+
# - name: unit tests
43+
# run: |
44+
# ./out/build/linux/frontend/frontend_libOTe -u
4545

4646

47-
- name: find source tree
48-
run: |
49-
cd libOTe_Tests/cmakeTests
50-
cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_PREFIX_PATH=../../
51-
cmake --build out/
52-
./out/main
53-
rm -rf out/
54-
cd ../..
47+
# - name: find source tree
48+
# run: |
49+
# cd libOTe_Tests/cmakeTests
50+
# cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -D CMAKE_PREFIX_PATH=../../
51+
# cmake --build out/
52+
# ./out/main
53+
# rm -rf out/
54+
# cd ../..
5555

56-
- name: hint test
57-
run: |
58-
cd libOTe_Tests/cmakeTests
59-
cmake -S . -B out/ -D LIBOTE_HINT=../..
60-
cmake --build out/
61-
./out/main
62-
rm -rf out/
63-
cd ../..
64-
65-
- name: install prefix test
66-
run: |
67-
python3 build.py --install=~/install -DCMAKE_BUILD_TYPE=RelWithDebInfo
68-
cd libOTe_Tests/cmakeTests
69-
cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=~/install
70-
cmake --build out/
71-
./out/main
72-
rm -rf out/
73-
cd ../..
56+
# - name: hint test
57+
# run: |
58+
# cd libOTe_Tests/cmakeTests
59+
# cmake -S . -B out/ -D LIBOTE_HINT=../..
60+
# cmake --build out/
61+
# ./out/main
62+
# rm -rf out/
63+
# cd ../..
64+
65+
# - name: install prefix test
66+
# run: |
67+
# python3 build.py --install=~/install -DCMAKE_BUILD_TYPE=RelWithDebInfo
68+
# cd libOTe_Tests/cmakeTests
69+
# cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=~/install
70+
# cmake --build out/
71+
# ./out/main
72+
# rm -rf out/
73+
# cd ../..
7474

7575

76-
- name: install test
77-
run: |
78-
python3 build.py --install --sudo -DCMAKE_BUILD_TYPE=RelWithDebInfo
79-
cd libOTe_Tests/cmakeTests
80-
cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo
81-
cmake --build out/
82-
./out/main
83-
rm -rf out/
84-
cd ../..
76+
# - name: install test
77+
# run: |
78+
# python3 build.py --install --sudo -DCMAKE_BUILD_TYPE=RelWithDebInfo
79+
# cd libOTe_Tests/cmakeTests
80+
# cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo
81+
# cmake --build out/
82+
# ./out/main
83+
# rm -rf out/
84+
# cd ../..
8585

8686

87-
- name: build libOTe w/ sodium
88-
run: |
89-
rm ./out/build/linux/frontend/frontend_libOTe
90-
python3 build.py --par=4 -D ENABLE_ALL_OT=ON -D ENABLE_SODIUM=ON -DENABLE_RELIC=OFF -DPRINT_LOG_ON_FAIL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
87+
# - name: build libOTe w/ sodium
88+
# run: |
89+
# rm ./out/build/linux/frontend/frontend_libOTe
90+
# python3 build.py --par=4 -D ENABLE_ALL_OT=ON -D ENABLE_SODIUM=ON -DENABLE_RELIC=OFF -DPRINT_LOG_ON_FAIL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
9191

92-
- name: unit tests
93-
run: ./out/build/linux/frontend/frontend_libOTe -u
92+
# - name: unit tests
93+
# run: ./out/build/linux/frontend/frontend_libOTe -u
9494

9595

96-
- name: find source tree
97-
run: |
98-
cd libOTe_Tests/cmakeTests
99-
cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSODIUM=ON -D CMAKE_PREFIX_PATH=../../
100-
cmake --build out/
101-
./out/main
102-
rm -rf out/
103-
cd ../..
96+
# - name: find source tree
97+
# run: |
98+
# cd libOTe_Tests/cmakeTests
99+
# cmake -S . -B out/ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DSODIUM=ON -D CMAKE_PREFIX_PATH=../../
100+
# cmake --build out/
101+
# ./out/main
102+
# rm -rf out/
103+
# cd ../..
104104

105-
- name: hint test
106-
run: |
107-
cd libOTe_Tests/cmakeTests
108-
cmake -S . -B out/ -DSODIUM=ON -D LIBOTE_HINT=../..
109-
cmake --build out/
110-
./out/main
111-
rm -rf out/
112-
cd ../..
113-
114-
- name: install prefix test
115-
run: |
116-
python3 build.py --install=~/install
117-
cd libOTe_Tests/cmakeTests
118-
cmake -S . -B out/ -DSODIUM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=~/install
119-
cmake --build out/
120-
./out/main
121-
rm -rf out/
122-
cd ../..
105+
# - name: hint test
106+
# run: |
107+
# cd libOTe_Tests/cmakeTests
108+
# cmake -S . -B out/ -DSODIUM=ON -D LIBOTE_HINT=../..
109+
# cmake --build out/
110+
# ./out/main
111+
# rm -rf out/
112+
# cd ../..
113+
114+
# - name: install prefix test
115+
# run: |
116+
# python3 build.py --install=~/install
117+
# cd libOTe_Tests/cmakeTests
118+
# cmake -S . -B out/ -DSODIUM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=~/install
119+
# cmake --build out/
120+
# ./out/main
121+
# rm -rf out/
122+
# cd ../..
123123

124124

125-
- name: install test
126-
run: |
127-
python3 build.py --install --sudo
128-
cd libOTe_Tests/cmakeTests
129-
cmake -S . -B out/ -DSODIUM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
130-
cmake --build out/
131-
./out/main
132-
rm -rf out/
133-
cd ../..
125+
# - name: install test
126+
# run: |
127+
# python3 build.py --install --sudo
128+
# cd libOTe_Tests/cmakeTests
129+
# cmake -S . -B out/ -DSODIUM=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo
130+
# cmake --build out/
131+
# ./out/main
132+
# rm -rf out/
133+
# cd ../..
134134

135135
# This workflow contains a single job called "build"
136136
build-osx:
@@ -151,7 +151,7 @@ jobs:
151151
run: python3 build.py -DENABLE_BOOST=OFF -DVERBOSE_FETCH=ON -DENABLE_SSE=OFF -DENABLE_MOCK_OT=true -D ENABLE_ALL_OT=ON
152152

153153
- name: unit tests
154-
run: ./out/build/osx/frontend/frontend_libOTe -u
154+
run: ./out/build/osx/frontend/frontend_libOTe -u RegularDpf_Puncture_Test
155155

156156

157157
- name: find source tree
@@ -194,52 +194,52 @@ jobs:
194194
cd ../..
195195
196196
197-
build-windows:
198-
# The type of runner that the job will run on
199-
runs-on: windows-2022
200-
timeout-minutes: 30
197+
# build-windows:
198+
# # The type of runner that the job will run on
199+
# runs-on: windows-2022
200+
# timeout-minutes: 30
201201

202-
# Steps represent a sequence of tasks that will be executed as part of the job
203-
steps:
204-
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
205-
- uses: actions/checkout@v2
206-
with:
207-
submodules: recursive
208-
- uses: seanmiddleditch/gha-setup-ninja@v3
209-
- uses: ilammy/msvc-dev-cmd@v1
210-
211-
# Runs a set of commands using the runners shell
212-
- name: build libOTe
213-
run: python3 build.py --par=1 -D ENABLE_ALL_OT=ON -DENABLE_MOCK_OT=true -G Ninja
202+
# # Steps represent a sequence of tasks that will be executed as part of the job
203+
# steps:
204+
# # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
205+
# - uses: actions/checkout@v2
206+
# with:
207+
# submodules: recursive
208+
# - uses: seanmiddleditch/gha-setup-ninja@v3
209+
# - uses: ilammy/msvc-dev-cmd@v1
210+
211+
# # Runs a set of commands using the runners shell
212+
# - name: build libOTe
213+
# run: python3 build.py --par=1 -D ENABLE_ALL_OT=ON -DENABLE_MOCK_OT=true -G Ninja
214214

215215

216-
- name: unit test
217-
run: ./out/build/x64-Release/frontend/frontend_libOTe.exe -u
216+
# - name: unit test
217+
# run: ./out/build/x64-Release/frontend/frontend_libOTe.exe -u
218218

219-
- name: find source tree
220-
run: |
221-
cd libOTe_Tests/cmakeTests
222-
cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=../../
223-
cmake --build out/ --config Release
224-
./out/Release/main.exe
225-
rm -r -fo out/
226-
cd ../..
219+
# - name: find source tree
220+
# run: |
221+
# cd libOTe_Tests/cmakeTests
222+
# cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release -D CMAKE_PREFIX_PATH=../../
223+
# cmake --build out/ --config Release
224+
# ./out/Release/main.exe
225+
# rm -r -fo out/
226+
# cd ../..
227227

228-
- name: hint test
229-
run: |
230-
cd libOTe_Tests/cmakeTests
231-
cmake -S . -B out/ -D LIBOTE_HINT=../..
232-
cmake --build out/ --config Release
233-
./out/Release/main.exe
234-
rm -r -fo out/
235-
cd ../..
236-
237-
- name: install prefix test
238-
run: |
239-
python3 build.py --install=~/install
240-
cd libOTe_Tests/cmakeTests
241-
cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=~/install
242-
cmake --build out/ --config Release
243-
./out/Release/main.exe
244-
rm -r -fo out/
245-
cd ../..
228+
# - name: hint test
229+
# run: |
230+
# cd libOTe_Tests/cmakeTests
231+
# cmake -S . -B out/ -D LIBOTE_HINT=../..
232+
# cmake --build out/ --config Release
233+
# ./out/Release/main.exe
234+
# rm -r -fo out/
235+
# cd ../..
236+
237+
# - name: install prefix test
238+
# run: |
239+
# python3 build.py --install=~/install
240+
# cd libOTe_Tests/cmakeTests
241+
# cmake -S . -B out/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=~/install
242+
# cmake --build out/ --config Release
243+
# ./out/Release/main.exe
244+
# rm -r -fo out/
245+
# cd ../..

‎libOTe/Dpf/RegularDpf.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -615,12 +615,9 @@ namespace osuCrypto
615615
{
616616
auto sdi = getRow(sd, i);
617617
auto tdi = getRow(td, i);
618-
for (u64 k = 0; k < numPoints8; k += 8)
619-
{
620-
SIMD8(q, output(k + q, i, sdi[k + q], tdi[k + q]));
621-
}
622-
for (u64 k = numPoints8; k < mNumPoints; ++k)
618+
for (u64 k = 0; k < mNumPoints; ++k)
623619
{
620+
std::cout << "k " << k << " i " << i << " " << sdi[k] << std::endl;
624621
output(k, i, sdi[k], tdi[k]);
625622
}
626623
}

0 commit comments

Comments
 (0)