Skip to content

Conversation

@Shillaker
Copy link
Collaborator

@Shillaker Shillaker commented Jan 1, 2022

Updates for Faabric dirty tracking changes in faasm/faabric#210

@Shillaker Shillaker marked this pull request as ready for review January 4, 2022 17:26
CONAN_CACHE_MOUNT_SOURCE: ~/.conan/
- name: Get Conan Version - Show Log
if: always()
run: cat /tmp/conan-ver-log
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This was broken and the caching wasn't working before, now it does AFAICT.

FetchContent_Declare(wavm_ext
GIT_REPOSITORY "https://github.com/faasm/WAVM.git"
GIT_TAG "faasm"
GIT_TAG "2434b3b170404b63afbd2103eecbf510dd1665f4"
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This update is crucial and I don't trust using a branch name in FetchContent.

./bin/cli.sh faasm

# Faabric
./bin/cli.sh faabric
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

No longer in this repo. Done directly in Faabric checkout.

# Build CPP functions and lib required for the tests
inv func.local
inv libfake
inv func.local libfake
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Changed these to one-liners to be more copy-pasteable

return std::span<uint8_t>(memBase, currentSize);
}

static std::string getAppSnapshotKey(const faabric::Message& msg)
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

All of this logic has been moved into the Executor class in Faabric now.

// thread number
m.set_groupidx(i);
m.set_groupsize(nextLevel->numThreads);
}
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This logic has also been absorbed into the Executor class in Faabric.

@Shillaker Shillaker requested a review from csegarragonz January 6, 2022 18:23
Copy link
Collaborator

@csegarragonz csegarragonz left a comment

Choose a reason for hiding this comment

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

LGTM. Just remember to:

  • Merge CPP PR first.
  • Re-tag (force) CPP code when merged.
  • Merge faabric first.
  • Update submodules for faabric and cpp in this PR.
  • Finally merge this PR.

@Shillaker Shillaker merged commit dc06c60 into master Jan 7, 2022
@Shillaker Shillaker deleted the dirty-tracking-updates branch January 7, 2022 12:38
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.

3 participants