8000 Bump faabric by csegarragonz · Pull Request #777 · faasm/faasm · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Bump faabric #777

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

Merged
merged 3 commits into from
Jul 26, 2023
Merged

Bump faabric #777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
def51f1
gh: bump faabric
csegarragonz Jul 25, 2023
c876236
nits: run clang-format
csegarragonz Jul 25, 2023
4e33cf8
gha: maximise build space for sgx-tests too
csegarragonz Jul 25, 2023
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
6 changes: 3 additions & 3 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ jobs:
env:
MINIO_ROOT_USER: minio
MINIO_ROOT_PASSWORD: minio123
planner:
image: faasm.azurecr.io/planner:0.5.0
steps:
- name: "Check out code"
uses: actions/checkout@v3
Expand Down Expand Up @@ -507,7 +505,9 @@ jobs:
key: ${{ env.CPU_MODEL }}-machine-code-${{ secrets.CACHE_VERSION }}
# Code build (Debug required for tests)
- name: "Build dev tools"
run: ./bin/inv_wrapper.sh dev.tools --build Debug --sgx Simulation --clean
run: |
./bin/inv_wrapper.sh dev.cmake --build Debug --sgx Simulation --clean
./bin/inv_wrapper.sh dev.cc codegen_func dev.cc codegen_shared_obj dev.cc tests
# Environment set-up
- name: "Run codegen for the tests"
run: ./bin/inv_wrapper.sh codegen.tests
Expand Down
3 changes: 3 additions & 0 deletions deploy/k8s-wamr/worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ spec:
value: "eth0"
- name: WASM_VM
value: "wamr"
# See faasm/faabric#335
- name: POINT_TO_POINT_SERVER_THREADS
value: "12"

---

Expand Down
2 changes: 1 addition & 1 deletion faabric
Open in desktop
Submodule faabric updated 0 files
36 changes: 16 additions & 20 deletions src/wamr/mpi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ using namespace faabric::mpi;
ctx->module->doThrowException(e); \
}

#define CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(call) \
#define CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(call) \
try { \
call; \
call; \
} catch (std::exception & e) { \
ctx = nullptr; \
auto __module = wasm::getExecutingWAMRModule(); \
__module->doThrowException(e); \
ctx = nullptr; \
auto __module = wasm::getExecutingWAMRModule(); \
__module->doThrowException(e); \
}

namespace wasm {
Expand Down Expand Up @@ -459,9 +459,8 @@ static int32_t MPI_Cart_shift_wrapper(wasm_exec_env_t execEnv,
(uintptr_t)sourceRank,
(uintptr_t)destRank);

CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(
ctx->world.shiftCartesianCoords(
ctx->rank, direction, disp, sourceRank, destRank))
CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(ctx->world.shiftCartesianCoords(
ctx->rank, direction, disp, sourceRank, destRank))

return MPI_SUCCESS;
}
Expand Down Expand Up @@ -708,8 +707,7 @@ static int32_t MPI_Isend_wrapper(wasm_exec_env_t execEnv,
int requestId;
CALL_MPI_WORLD_CATCH_EXCEPTION(
requestId,
ctx->world.isend(
ctx->rank, destRank, (uint8_t*)buffer, hostDtype, count))
ctx->world.isend(ctx->rank, destRank, (uint8_t*)buffer, hostDtype, count))

ctx->writeFaasmRequestId(requestPtrPtr, requestId);

Expand Down Expand Up @@ -769,9 +767,8 @@ static int32_t MPI_Recv_wrapper(wasm_exec_env_t execEnv,

ctx->module->validateNativePointer(buffer, count * hostDtype->size);

CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(
ctx->world.recv(
sourceRank, ctx->rank, (uint8_t*)buffer, hostDtype, count, status))
CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(ctx->world.recv(
sourceRank, ctx->rank, (uint8_t*)buffer, hostDtype, count, status))

return MPI_SUCCESS;
}
Expand Down Expand Up @@ -874,13 +871,12 @@ static int32_t MPI_Scan_wrapper(wasm_exec_env_t execEnv,
ctx->module->validateNativePointer(sendBuf, count * hostDtype->size);
}

CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(
ctx->world.scan(ctx->rank,
(uint8_t*)sendBuf,
(uint8_t*)recvBuf,
hostDtype,
count,
hostOp))
CALL_MPI_WORLD_CATCH_EXCEPTION_NO_RETURN(ctx->world.scan(ctx->rank,
(uint8_t*)sendBuf,
(uint8_t*)recvBuf,
hostDtype,
count,
hostOp))

return MPI_SUCCESS;
}
Expand Down
0