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

Add new game: Nim #868

Closed
wants to merge 8 commits into from
Closed

Conversation

acforvs
Copy link
Contributor

@acforvs acforvs commented Jun 26, 2022

Hey OpenSpiel team,

I would love to address the recent Call for New Games #843 and suggest this implementation of the game Nim :)

Looking forward to any comments

@lanctot
Copy link
Collaborator

lanctot commented Jun 26, 2022

Thanks!

The test failure seems unrelated to your PR -- we'll fix it separately and then ask you to pull from master.

Also, we've been a bit busy and are a bit behind on importing PRs so there might be some delay.

@acforvs
Copy link
Contributor Author

acforvs commented Jun 26, 2022

Okay, thanks!

@lanctot
Copy link
Collaborator

lanctot commented Jun 27, 2022

Hi @acforvs,

Ok we fixed these errors in #869, which is now in master. Can you pull changes from master and commit the merge to trigger the tests again with these changes?

@lanctot lanctot mentioned this pull request Jun 27, 2022
@lanctot
Copy link
Collaborator

lanctot commented Jun 27, 2022

I don't see a merge commit? I think you will have to pull the changes that were pushed to master just a few hours ago.

@lanctot
Copy link
Collaborator

lanctot commented Jun 27, 2022

Specifically, these: 6a49b93

@acforvs
Copy link
Contributor Author

acforvs commented Jun 27, 2022

@lanctot should be fixed, I accidentally rebased from my fork's master which wasn't up to date

@acforvs
Copy link
Contributor Author

acforvs commented Jun 27, 2022

@lanctot wheels failed again.. could you take a look please once you have a moment?

@acforvs
Copy link
Contributor Author

acforvs commented Jun 27, 2022

I think the problem might be in https://github.com/deepmind/open_spiel/blob/master/open_spiel/games/euchre.cc#L476, should I create a separate PR in order to fix it?

upd: looks like the reason is in recent commits 15145eb and 910cf6d after all

@lanctot
Copy link
Collaborator

lanctot commented Jun 27, 2022

Yeah that's on our side -- the wheel tests are more restrictive and we don't have an easy way to test this internally. It's quite rare to encounter these, you've been really unlucky. Should be fixable -- I'll give it a shot.

@lanctot
Copy link
Collaborator

lanctot commented Jun 27, 2022

Unless I made a typo or incorrect assumption, I believe this will fix it: #870

(You can apply that locally in your branch and commit it, because the person I'd like to ask to review it is on holiday and I will soon be too. It's fine if it's duplicated from master because our import tool can detect that and won't cause any conflicts.)

@acforvs
Copy link
Contributor Author

acforvs commented Jun 28, 2022

Great, thank you! I will wait for the tests there to pass and apply that code locally
Enjoy your holiday by the way :)

@lanctot
Copy link
Collaborator

lanctot commented Jun 28, 2022

Yeah hit a few bumps. I've tried one last thing for tonight that I think will work, but it might not be what the Euchre author prefers, so I'll wait until we can pull it in properly to ask you to rerun. Given our schedules, might only be in a few weeks.

@lanctot
Copy link
Collaborator

lanctot commented Jun 28, 2022

The fixes in #870 will require some more thought. I will tag the original author and will update you when we have it fixed.

@lanctot
Copy link
Collaborator

lanctot commented Jun 30, 2022

Alright, update: #873 will fix the last few test failures, but it will not be merged for a while (and once it's done will require you to run ./install.sh again after pulling from master). So, I think with the other tests passing, no need to worry about this, we can import it as is. However, it might take some time for reviews due to scheduling.

@acforvs
Copy link
Contributor Author

acforvs commented Jun 30, 2022

Great, thanks! Could I do the same as you suggested here #868 (comment) and apply those changes locally prior to the merge?

@lanctot
Copy link
Collaborator

lanctot commented Jun 30, 2022

Yes, that should work if you want to try it.

Copy link
Collaborator

@lanctot lanctot left a comment

Choose a reason for hiding this comment

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

Can you add the game and its description to docs/games.md?

open_spiel/games/nim.h Show resolved Hide resolved
open_spiel/games/nim.h Show resolved Hide resolved
open_spiel/games/nim.h Show resolved Hide resolved
open_spiel/games/nim_test.cc Show resolved Hide resolved
@acforvs acforvs requested a review from lanctot July 2, 2022 21:13
@lanctot
Copy link
Collaborator

lanctot commented Jul 4, 2022

Hi @acforvs, just a heads-up: I have already imported this PR so that last commit won't make it (and any subsequent changes to your branch won't either.)

I did a few style fixes on our end during the import.

Now I'm just waiting on an internal review and once it's in, it should be included with the next github sync.

@acforvs
Copy link
Contributor Author

acforvs commented Jul 4, 2022

@lanctot oh okay, thanks! I thought that since there were no "imported" tag I could still make some adjustments :)

@lanctot
Copy link
Collaborator

lanctot commented Jul 4, 2022

@lanctot oh okay, thanks! I thought that since there were no "imported" tag I could still make some adjustments :)

Yeah.. it's a good point. I normally only set the "imported" label once the internal review is done and it's submitted into our system (because I didn't want authors to be confused if it didn't show up on the sync)... and it's never made a difference.

But I think I'll do that from now on and change the label text for better communication. Sorry about that!

@lanctot lanctot added imported This PR has been imported and awaiting internal review. Please avoid any more local changes, thanks! merged internally The code is now submitted to our internal repo and will be merged in the next github sync. labels Jul 4, 2022
OpenSpiel pushed a commit that referenced this pull request Jul 11, 2022
PiperOrigin-RevId: 459879018
Change-Id: I0ccfe747dae16c8d29367dd33bcdd538957f15f2
@lanctot lanctot closed this Jul 11, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
imported This PR has been imported and awaiting internal review. Please avoid any more local changes, thanks! merged internally The code is now submitted to our internal repo and will be merged in the next github sync.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants