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

Fix KPI_EXTRACTION deadlock and missing EXPERIMENT_NAME strings to unblock CDP processing #185

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

MichaelTiemannOSC
Copy link
Contributor

I have hand-picked changes from cdp2-experiments that have unblocked the processing of CDP reports. The two principal changes are:

  • Addition of num_processes slot to training_config so that DataSilo can honor it
  • Further implementation of EXPERIMENT_NAME idea so that we copy data from the correct, rather than incorrect, storage locations in the S3 bucket.

Signed-off-by: MichaelTiemannOSC [email protected]

@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.


Powered by ReviewNB

@sesheta sesheta requested a review from erikerlandson July 16, 2022 17:56
@sesheta
Copy link
Member

sesheta commented Jul 16, 2022

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign durandom after the PR has been reviewed.
You can assign the PR to them by writing /assign @durandom in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sesheta
Copy link
Member

sesheta commented Jul 18, 2022

@MichaelTiemannOSC: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
aicoe-ci/prow/pre-commit 5ec8dba link true /test pre-commit

Full PR test history. Your PR dashboard. Please help us and open an issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@MichaelTiemannOSC
Copy link
Contributor Author

I've tried, and again failed, to squash these changes properly. Here's the garbage cluttering my terminal window in my JupyterHub notebook:

[1000630000@jupyterhub-nb-michaeltiemannosc aicoe-osc-demo-MichaelTiemannOSC]$ git push -u origin cdp-fixups
Username for 'https://github.com': MichaelTiemannOSC
Password for 'https://[email protected]': 
To https://github.com/MichaelTiemannOSC/aicoe-osc-demo.git
 ! [rejected]        cdp-fixups -> cdp-fixups (non-fast-forward)
error: failed to push some refs to 'https://github.com/MichaelTiemannOSC/aicoe-osc-demo.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
[1000630000@jupyterhub-nb-michaeltiemannosc aicoe-osc-demo-MichaelTiemannOSC]$ git pull
warning: Pulling without specifying how to reconcile divergent branches is
discouraged. You can squelch this message by running one of the following
commands sometime before your next pull:

  git config pull.rebase false  # merge (the default strategy)
  git config pull.rebase true   # rebase
  git config pull.ff only       # fast-forward only

You can replace "git config" with "git config --global" to set a default
preference for all repositories. You can also pass --rebase, --no-rebase,
or --ff-only on the command line to override the configured default per
invocation.

error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.

I'm trying so hard to learn the Git/GitHub system enough that I can make basic changes like these without breaking everything, but I just haven't been around the block enough times to make it natural to me. I really don't understand what its telling me about not concluding/finishing a merge, because the diffs of these two commits are the complete changes I wanted to push.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants