Adding game german_whist_foregame #1171

willmcgowan · 2024-01-29T09:33:28Z

German Whist is a 2 player imperfect information trick-taking card game. The rules are outlined here https://en.wikipedia.org/wiki/German_whist#:~:text=German%20whist%20is%20a%20variant,is%20probably%20of%20British%20origin.

Modified from previous pull request, no longer requires x86intrin.h or bmi2 support.

Lots of changes, currently endgame compiles but does not run which is an issue

TESTING BUILDTABLEBAASSE

All works

removed dependence on bmi2 intrinsics and x86intrin.h

willmcgowan · 2024-01-29T20:01:38Z

I hadn't added the game name to the pyspiel tests expected games.

Removed MTD as it slows generation of tablebase. Removed move ordering heuristics from legalactions as it slows tablebase generation. Hacky move ordering heuristics remain for speeding up verification. Tablebase generation is 50% faster

Modified bzhi bithack so it will compile to bzhi when __bmi2__ is defined. Modified pext bithack so it will call _pext_u64 when __bmi2__ is defined, otherwise it will use the bithack. LoadTTable now warns on failing to load and sets TTable to default value(all 0)

willmcgowan · 2024-02-04T10:54:36Z

@lanctot Should I remove ismcts_gwhist from the PR?

lanctot · 2024-02-06T14:14:11Z

@lanctot Should I remove ismcts_gwhist from the PR?

No it's ok, you can leave it. Good to have an example and it's in the right place.

lanctot · 2024-02-13T15:30:40Z

I don't know what is going on but the tests keep failing repeatedly after your last commit. Can you pull changes from master and push the merge commit? (maybe make an inconsequential change to one of your files if necessary to trigger the tests)

Apologies on the lateness in looking at this, I will take a look as soon as the tests pass.

lanctot · 2024-02-13T15:31:54Z

open_spiel/games/german_whist_foregame/german_whist_foregame.h

+
+inline const std::array<uint64_t, 4> kSuitMasks = { bzhi_u64(~0,kNumRanks),bzhi_u64(~0,2 * kNumRanks) ^ bzhi_u64(~0,kNumRanks),bzhi_u64(~0,3 * kNumRanks) ^ bzhi_u64(~0,2 * kNumRanks),bzhi_u64(~0,4 * kNumRanks) ^ bzhi_u64(~0,3 * kNumRanks) };
+
+


Can you add some high-level comments to these structures and methods, just generally to explain what they are used for and what they do?

lanctot · 2024-02-13T15:33:02Z

open_spiel/games/german_whist_foregame/german_whist_foregame.h

+    void SetChar(size_t i,size_t j,char value);
+    char Get(size_t i,size_t j) const;
+    void Set(size_t i,size_t j,char value);
+};


Maybe take a quick look at Google C++ style. Each line should be at most 80 characters. There are automated linters you can use (see the docs for adding a game, step 9)

Also should be blank lines between definitions of classes and functions (see the other game implementations for examples)

to pass api_test

willmcgowan · 2024-02-18T04:11:07Z

My apologies for the delay in getting back to you, I have issues getting the python tests to run on my device due to some issues with absl.
api_test.py and the playthrough_test.py are failing. With regard to api_test.py I have added an assert in the informationstatestring implementation.
I can add some more extensive comments and linting by monday.

Added playthrough with incorrect tablebase value. Checks for InfoStateString and ObservationString

willmcgowan · 2024-03-08T14:02:19Z

Sorry for taking so long to address some of the issues.
On my device the playthrough test is failing throwing this error:

**Traceback (most recent call last):
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/../integration_tests/playthrough_test.py", line 90, in test_all_games_tested
missing_games = set(_AVAILABLE_GAMES) - set(_MISSING_GAMES) - set(
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/../integration_tests/playthrough_test.py", line 91, in
_playthrough_match(os.path.join(path, basename), _SHORTNAME)[1]
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/../integration_tests/playthrough_test.py", line 57, in _playthrough_match
data = f.read()
File "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/lib/python3.9/codecs.py", line 322, in decode
(result, consumed) = self._buffer_decode(data, self.errors, final)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 3131: invalid start byte

======================================================================
ERROR: test_playthrough_.DS_Store (main.PlaythroughTest)
PlaythroughTest.test_playthrough_.DS_Store

Traceback (most recent call last):
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/../integration_tests/playthrough_test.py", line 108, in
test_func = lambda self, basename=basename: self.run_test(path, basename)
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/../integration_tests/playthrough_test.py", line 76, in run_test
expected, actual = generate_playthrough.replay(file_path)
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/algorithms/generate_playthrough.py", line 526, in replay
original, kwargs = _read_playthrough(filename)
File "/Users/thomasmcgowan/Documents/Github/open_spiel/open_spiel/python/algorithms/generate_playthrough.py", line 519, in _read_playthrough
original = f.read()
File "/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/3.9/lib/python3.9/codecs.py", line 322, in decode
(result, consumed) = self._buffer_decode(data, self.errors, final)
UnicodeDecodeError: 'utf-8' codec can't decode byte 0x80 in position 3131: invalid start byte

Investigating with hexdump:
xxd -l 16 -s 3131 ./open_spiel/integration_tests/playthroughs/german_whist_foregame.txt
00000c3b: 3139 3630 3738 292c 2028 3134 2c30 2e30 196078), (14,0.0
This is the segment (where the chance outcomes are being printed).
I thought perhaps because my infostate string/observation state string made use of "/n" that might be causing the issue.

lanctot

Hi @willmcgowan, sorry but I missed a few things that are critical. I had started the import but the changes required are non-trivial. Apologies for the delay.

open_spiel/games/german_whist_foregame/german_whist_endgame.cc

open_spiel/games/german_whist_foregame/german_whist_foregame.cc

lanctot · 2024-10-10T13:44:05Z

Apologies for the delays.. the summer ended up a bit busier than I expected!

Should finally be merged some time soon (today or next few days).

lanctot · 2024-10-17T12:43:34Z

Hi @willmcgowan, we had to remove the game because it was crashing in the playthrough test.

I tried a few things but ultimately could not fix it. I believe it might be due to the game construction trying to read the transposition table from disk or maybe taking up too much memory constructing the initial TTable.

Here's the commit: a66063d

We should have a version of the game that will work without a transposition table, i.e. make it optional by default.

If you want to take a look please start from the fixed version in this commit above. I had to make a number of changes for it to fit our internal style and the version above includes all of them. If you find and fix it, then please resubmit as a new PR.

willmcgowan and others added 17 commits November 12, 2023 22:15

Create german_whist_foregame

f717bf6

Delete open_spiel/games/german_whist_foregame

11096d0

Create german_whist_foregame.cc

8485343

Create german_whist_foregame.h

397489a

Create solver.cc

9851a65

Create german_whist_foregame_test.cc

8b2aea9

Beginning

5ac7efe

Majority of changes

f1ce917

Lots of changes, currently endgame compiles but does not run which is an issue

DONEEEE

f9c9561

TESTING BUILDTABLEBAASSE

Modified TTable datastructure

b29507a

All works

Update spiel.h

927e1f6

Update basic_tests.cc

6095750

Small clean up

3f3183c

More cleanup

7678158

set kTTablePath to empty string

5484fa9

Modified all intrinsics to generics

3184a10

removed dependence on bmi2 intrinsics and x86intrin.h

added game name to pyspiel test

aee203b

willmcgowan added 4 commits January 30, 2024 01:32

Code cleanup/speedup

51d92b0

Removed MTD as it slows generation of tablebase. Removed move ordering heuristics from legalactions as it slows tablebase generation. Hacky move ordering heuristics remain for speeding up verification. Tablebase generation is 50% faster

Removed attempt to add compile with BMI2

a53bb57

Removing text

20ecb71

lanctot requested changes Feb 13, 2024

View reviewed changes

willmcgowan added 2 commits February 18, 2024 02:59

Update pyspiel_test.py

931113a

Update german_whist_foregame.cc

6727aee

to pass api_test

Changes to pass integration testss

a705df1

Added playthrough with incorrect tablebase value. Checks for InfoStateString and ObservationString

willmcgowan force-pushed the GermanWhistForegame branch from 6727aee to a705df1 Compare March 7, 2024 21:15

willmcgowan added 3 commits March 7, 2024 21:21

missing comma

4a367d8

Formatting

c65002d

LINTING

5e02ea0

Fixed const correctness

4cd3016

willmcgowan force-pushed the GermanWhistForegame branch from 91dbb2b to 4cd3016 Compare March 8, 2024 19:27

lanctot approved these changes Apr 16, 2024

View reviewed changes

lanctot requested changes Apr 18, 2024

View reviewed changes

open_spiel/games/german_whist_foregame/german_whist_endgame.cc Outdated Show resolved Hide resolved

open_spiel/games/german_whist_foregame/german_whist_foregame.cc Outdated Show resolved Hide resolved

willmcgowan added 3 commits July 2, 2024 16:53

Using Approved Headers

b3032e5

removed std::thread dependency

b3490d0

Semicolon

192c9f6

lanctot added imported This PR has been imported and awaiting internal review. Please avoid any more local changes, thanks! and removed imported This PR has been imported and awaiting internal review. Please avoid any more local changes, thanks! labels Oct 9, 2024

lanctot approved these changes Oct 9, 2024

View reviewed changes

lanctot added the merged internally The code is now submitted to our internal repo and will be merged in the next github sync. label Oct 10, 2024

lanctot closed this Oct 10, 2024

lanctot reopened this Oct 10, 2024

lanctot merged commit a66063d into google-deepmind:master Oct 10, 2024
18 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Adding game german_whist_foregame #1171

Adding game german_whist_foregame #1171

willmcgowan commented Jan 29, 2024

willmcgowan commented Jan 29, 2024

willmcgowan commented Feb 4, 2024

lanctot commented Feb 6, 2024

lanctot commented Feb 13, 2024

lanctot Feb 13, 2024

lanctot Feb 13, 2024

willmcgowan commented Feb 18, 2024

willmcgowan commented Mar 8, 2024

lanctot left a comment

lanctot commented Oct 10, 2024

lanctot commented Oct 17, 2024


		inline const std::array<uint64_t, 4> kSuitMasks = { bzhi_u64(~0,kNumRanks),bzhi_u64(~0,2 * kNumRanks) ^ bzhi_u64(~0,kNumRanks),bzhi_u64(~0,3 * kNumRanks) ^ bzhi_u64(~0,2 * kNumRanks),bzhi_u64(~0,4 * kNumRanks) ^ bzhi_u64(~0,3 * kNumRanks) };

Adding game german_whist_foregame #1171

Adding game german_whist_foregame #1171

Conversation

willmcgowan commented Jan 29, 2024

willmcgowan commented Jan 29, 2024

willmcgowan commented Feb 4, 2024

lanctot commented Feb 6, 2024

lanctot commented Feb 13, 2024

lanctot Feb 13, 2024

Choose a reason for hiding this comment

lanctot Feb 13, 2024

Choose a reason for hiding this comment

willmcgowan commented Feb 18, 2024

willmcgowan commented Mar 8, 2024

====================================================================== ERROR: test_playthrough_.DS_Store (main.PlaythroughTest) PlaythroughTest.test_playthrough_.DS_Store

lanctot left a comment

Choose a reason for hiding this comment

lanctot commented Oct 10, 2024

lanctot commented Oct 17, 2024

======================================================================
ERROR: test_playthrough_.DS_Store (main.PlaythroughTest)
PlaythroughTest.test_playthrough_.DS_Store