Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade opencv + docker image used for cimbar.js wasm build #112

Merged
merged 1 commit into from
Oct 21, 2024
Merged

Upgrade opencv + docker image used for cimbar.js wasm build #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ jobs:

- name: Get openCV
run: |
wget https://github.com/opencv/opencv/archive/refs/tags/4.5.5.zip
unzip 4.5.5.zip
mv opencv-4.5.5 opencv4
wget https://github.com/opencv/opencv/archive/refs/tags/4.10.0.zip
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/opencv/opencv/releases/tag/4.10.0

unzip 4.10.0.zip
mv opencv-4.10.0 opencv4

- name: Run the build process with Docker
uses: addnab/docker-run-action@v3
with:
image: emscripten/emsdk:3.1.39
image: emscripten/emsdk:3.1.69
options: -v ${{ github.workspace }}:/usr/src/app
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion package-wasm.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.39
#docker run --mount type=bind,source="$(pwd)",target="/usr/src/app" -it emscripten/emsdk:3.1.69 bash

cd /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion src/third_party_lib/wirehair/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ set(GEN_TABLES
gf256.h
)

if(NOT ANDROID)
if(NOT ANDROID AND NOT USE_WASM)
set(ARCH_NATIVE "-march=native")
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The reason for pause I have is that low-power devices (i.e. android phones) are where we'd really benefit from the optimization -- and we're not doing it there anyway. So it might make sense to toss this altogether.

endif()

Expand Down
Loading