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.

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

Support to run ImageMagick #680

Merged
merged 10 commits into from
Jan 9, 2023
Merged

Support to run ImageMagick #680

merged 10 commits into from
Jan 9, 2023

Conversation

csegarragonz
Copy link
Collaborator

@csegarragonz csegarragonz commented Oct 5, 2022

In this PR I include support to run ImageMagick in WAVM, and WAMR. The SGX PR will follow, as it is larger in size.

I also add a test that takes a sample image and flips it. I use Faasm's logo as test image.

@@ -4,6 +4,20 @@
#include <unordered_map>
#include <vector>

#define FAKE_NAME "faasm"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Moving these definitions to a header where all runtimes can benefit from them.

REG_NATIVE_FUNC(__wasi_fd_dup, "(i*)i"),
REG_NATIVE_FUNC(dup, "(i)i"),
REG_NATIVE_FUNC(tempnam, "(ii)i"),
REG_NATIVE_FUNC(__wasi_fd_dup, "(i*)i"), REG_NATIVE_FUNC(dup, "(i)i"),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Weird formatting by clang-format here.

@@ -64,6 +64,12 @@ jobs:
- name: "Build libfake"
run: ./bin/inv_wrapper.sh libfake
working-directory: ${{ github.workspace }}/clients/cpp
- name: "Update ImageMagick submodule"
run: git submodule update --init -f third-party/ImageMagick
working-directory: ${{ github.workspace }}/clients/cpp
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do we need to update the ImageMagick submodule here? We're checking out the code with submodules: true which should do this implicitly.

@csegarragonz
Copy link
Collaborator Author

csegarragonz commented Oct 24, 2022

This should be good to go after #688 is merged in

@csegarragonz csegarragonz merged commit 52d6acf into main Jan 9, 2023
@csegarragonz csegarragonz deleted the image branch January 9, 2023 16:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants