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

fixed docker file generation for C/Ccpp target and python target #700

Merged
merged 14 commits into from
Nov 1, 2021

Conversation

housengw
Copy link
Contributor

C/Ccpp target:
fixed both standalone and federated docker file generation.

Python target:
added standalone docker file generation.

Also added an example at example/C/ContainerizedFederatedHelloWorld

@housengw housengw requested a review from Soroosh129 October 29, 2021 19:37
@housengw housengw closed this Oct 29, 2021
@Soroosh129
Copy link
Contributor

Hi Steven
Why did you close this PR?
You can mark it as a draft PR if you think something needs to be added.

@housengw housengw reopened this Oct 29, 2021
@housengw
Copy link
Contributor Author

oh i was trying to resolve the merge conflict

@housengw housengw marked this pull request as draft October 29, 2021 20:28
@housengw
Copy link
Contributor Author

converting this to draft because I am getting a

lfc: error: Platform mac os x is not supported
 --> (unknown file):null:1 - Platform mac os x is not supported

error after resolving conflicts

@Soroosh129
Copy link
Contributor

converting this to draft because I am getting a

lfc: error: Platform mac os x is not supported
 --> (unknown file):null:1 - Platform mac os x is not supported

error after resolving conflicts

Hmm, the merge created a weird addPlatformFiles. My guess is that it should look like this. Not sure what happened there.

@Soroosh129
Copy link
Contributor

My guess is that the merge conflict happened because of this line in master:

// All platforms use this one.
coreFiles.add("platform/lf_tag_64_32.h");

@housengw housengw marked this pull request as ready for review October 30, 2021 17:09
Copy link
Member

@lhstrh lhstrh left a comment

Choose a reason for hiding this comment

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

This looks good! I left a minor comment (and I saw there was also an unaddressed comment from @Soroosh129).

@Soroosh129 Soroosh129 merged commit cb5b11c into master Nov 1, 2021
@Soroosh129 Soroosh129 deleted the generate-docker-file branch November 1, 2021 17:54
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