Update Episteme.json #32

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

Open

aletheiaaaaa wants to merge 135 commits into dannyhammer:patch-1 from aletheiaaaaa:patch-1

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -18,3 +18,8 @@ Media/* @@
     Media/PGNs/*
     Media/Networks/*
     Media/Events/*
+    *.lock
+    *.epd
+    webhooks.json

Books/UHO_Lichess_4852_v1.epd.json

-Original file line number
+Diff line change
@@ -0,0 +1,4 @@
+    {
+        "sha": "7A7F6470615A69C6CF23D565417701D38732876F480AF90D67B42ABADE35644A",
+        "source": "https://raw.githubusercontent.com/AndyGrant/openbench-books/master/UHO_Lichess_4852_v1.epd.zip"
+    }

Client/bench.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -20,8 +20,8 @@
  
    # The sole purpose of this module is to invoke run_benchmark().

    #

    #   - binary   : Path to, and including, the Binary File

    #   - network  : Path to Network File, or None

    #   - binary   : Relative path to, and including, the Binary File

    #   - network  : Relative path to a private engine's Network File, or None

    #   - private  : True or False; Private NNUE engines require special care

    #   - threads  : Number of concurrent benches to run

    #   - sets     : Number of times to repeat this experiment

    @@ -37,8 +37,9 @@
  
    import subprocess

    import sys

    from utils import kill_process_by_name

    from utils import OpenBenchBadBenchException

    ## Local imports must only use "import x", never "from x import ..."

    import utils

    MAX_BENCH_TIME_SECONDS = 60

    @@ -103,8 +104,8 @@ def multi_core_bench(binary, network, private, threads):
  
            return [outqueue.get(timeout=MAX_BENCH_TIME_SECONDS) for ii in range(threads)]

        except queue.Empty: # Force kill the engine, thus causing the processes to finish

            kill_process_by_name(binary)

            raise OpenBenchBadBenchException('[%s] Bench Exceeded Max Duration' % (binary))

            utils.kill_process_by_name(binary)

            raise utils.OpenBenchBadBenchException('[%s] Bench Exceeded Max Duration' % (binary))

        finally: # Join everything to avoid zombie processes

            for process in processes:

    @@ -120,12 +121,12 @@ def run_benchmark(binary, network, private, threads, sets, expected=None):
  
                benches.append(bench); speeds.append(speed)

        if len(set(benches)) != 1:

            raise OpenBenchBadBenchException('[%s] Non-Deterministic Benches' % (engine))

            raise utils.OpenBenchBadBenchException('[%s] Non-Deterministic Benches' % (engine))

        if None in benches or None in speeds:

            raise OpenBenchBadBenchException('[%s] Failed to Execute Benchmark' % (engine))

            raise utils.OpenBenchBadBenchException('[%s] Failed to Execute Benchmark' % (engine))

        if expected and expected != benches[0]:

            raise OpenBenchBadBenchException('[%s] Wrong Bench: %d' % (engine, benches[0]))

            raise utils.OpenBenchBadBenchException('[%s] Wrong Bench: %d' % (engine, benches[0]))

        return int(sum(speeds) / len(speeds)), benches[0]

        return sum(speeds) // len(speeds), benches[0]

Client/client.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -96,10 +96,11 @@ def parse_arguments(): @@
         )
         # Create and parse all arguments into a raw format
-        p.add_argument('-U', '--username', help=help_user         , required=req_user  )
-        p.add_argument('-P', '--password', help=help_pass         , required=req_pass  )
-        p.add_argument('-S', '--server'  , help=help_server       , required=req_server)
-        p.add_argument(      '--clean'   , help='Force New Client', action='store_true')
+        p.add_argument('-U', '--username'           , help=help_user                , required=req_user  )
+        p.add_argument('-P', '--password'           , help=help_pass                , required=req_pass  )
+        p.add_argument('-S', '--server'             , help=help_server              , required=req_server)
+        p.add_argument(      '--clean'              , help='Force New Client'       , action='store_true')
+        p.add_argument(      '--no-client-downloads', help='NEVER download a client', action='store_true')
         # Override, to possibly print worker.py's help as well as client.py's
         p.print_help = lambda: custom_help(p.format_help())
@@ Expand Down Expand Up / @@ -160,6 +161,9 @@ def download_client_files(args): @@
         args = parse_arguments()
+        if args.no_client_downloads and not has_worker():
+            raise Exception('Client missing, and --no-client-downloads provided')
         if args.clean or not has_worker():
             print ('[NOTE] Downloading Client...')
             try_forever(download_client_files, [args], 'Failed to download Client files')
@@ Expand All / @@ -174,6 +178,10 @@ def download_client_files(args): @@
                 worker.run_openbench_worker(args)
             except BadVersionException:
+                if args.no_client_downloads:
+                    raise Exception('Client update requested, but --no-client-downloads provided')
                 print ('[NOTE] Downloading newer version of Client...')
                 try_forever(download_client_files, [args], 'Failed to download Client files')
@@ Expand Down @@

Client/genfens.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -18,14 +18,14 @@
  
    #                                                                           #

    # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

    # The sole purpose of this module is to invoke create_genfens_opening_book().

    # The main purpose of this module is to invoke create_genfens_opening_book().

    # Refer to Client/worker.py, or Scripts/genfens_engine.py for the arguments.

    #

    # This will execute engines with commands like the following:

    # We will execute engines with commands like the following:

    #   ./engine "genfens N seed S book <None|Books/book.epd> <?extra>" "quit"

    #

    # This work is split over many engines. If a workload requires 1024 openings,

    # and there are 16 threads, then each thread will generate 64 openings. The

    # openings are saved to Books/openbench.genfens.epd

    # and there are 16 threads, then each thread will generate 64 openings.

    #

    # create_genfens_opening_book() may raise utils.OpenBenchFailedGenfensException.

    # This occurs when longer than 15 seconds has elapsed since getting an opening.

    @@ -38,8 +38,9 @@
  
    import time

    import multiprocessing

    from utils import kill_process_by_name

    from utils import OpenBenchFailedGenfensException

    ## Local imports must only use "import x", never "from x import ..."

    import utils

    def genfens_required_openings_each(config):

    @@ -50,38 +51,22 @@ def genfens_required_openings_each(config):
  
        return math.ceil(total_games / config.threads)

    def genfens_command_args(config, binary_name, network):

        binary      = os.path.join('Engines', binary_name)

        private     = config.workload['test']['dev']['private']

        N           = genfens_required_openings_each(config)

        book        = genfens_book_input_name(config)

        extra_args  = config.workload['test']['genfens_args']

        return (binary, network, private, N, book, extra_args)

    def genfens_book_input_name(config):

        book_name   = config.workload['test']['book']['name']

        book_none   = book_name.upper() == 'NONE'

        book_name = config.workload['test']['book']['name']

        book_none = book_name.upper() == 'NONE'

        return 'None' if book_none else os.path.join('Books', book_name)

    def genfens_seed(config, N_per_thread, thread_index):

        x = config.workload['test']['book_seed']

        y = config.workload['test']['book_index']

        return (x << 32) + (y + N_per_thread * thread_index)

    def genfens_command_builder(args, index):

    def genfens_command_builder(binary, network, private, N, book, extra_args, seed):

        command = ['./%s' % (args['engine'])]

        command = ['./%s' % (binary)]

        if args['network'] and args['private']:

            command += ['setoption name EvalFile value %s' % (args['network'])]

        if network and private:

            command += ['setoption name EvalFile value %s' % (network)]

        command += ['genfens %d seed %d book %s %s' % (N, seed, book, extra_args), 'quit']

        fstr = 'genfens %d seed %d book %s %s'

        command += [fstr % (args['N'], args['seeds'][index], args['book'], args['extra']), 'quit']

        return command

    @@ -101,51 +86,55 @@ def genfens_single_threaded(command, queue):
  
    def genfens_progress_bar(curr, total):

        prev_progress = int(50 * (curr - 1) / total)

        curr_progress = int(50 * (curr - 0) / total)

        prev_progress = 50 * (curr - 1) // total

        curr_progress = 50 * (curr - 0) // total

        if curr_progress != prev_progress:

            bar_text = '=' * curr_progress + ' ' * (50 - curr_progress)

            print ('\r[%s] %d/%d' % (bar_text, curr, total), end='', flush=True)

    def create_genfens_opening_book(config, binary_name, network):

    def convert_fen_to_epd(fen):

        # Input  : rnbqkbnr/pppp2pp/4pp2/8/2P2P2/P7/1P1PP1PP/RNBQKBNR b KQkq - 0 3

        # Output : rnbqkbnr/pppp2pp/4pp2/8/2P2P2/P7/1P1PP1PP/RNBQKBNR b KQkq - hmvc 0; fmvn 3;

        halfmove, fullmove = fen.split()[4:]

        # Format: ./engine "genfens N seed S book <None|book.epd>" "quit"

        N     = genfens_required_openings_each(config)

        seeds = config.workload['test']['genfens_seeds']

        args  = genfens_command_args(config, binary_name, network)

        return ' '.join(fen.split()[:4]) + ' hmvc %d; fmvn %d;' % (int(halfmove), int(fullmove))

    def create_genfens_opening_book(args):

        N          = args['N']

        threads    = args['threads']

        start_time = time.time()

        output     = multiprocessing.Queue()

        print ('\nGenerating %d Openings using %d Threads...' % (N * config.threads, config.threads))

        print ('\nGenerating %d Openings using %d Threads...' % (N * threads, threads))

        # Split the work over many threads. Ensure the seed varies by the thread,

        # number in accordance with how many openings each thread will generate

        processes = [

            multiprocessing.Process(

                target=genfens_single_threaded,

                args=(genfens_command_builder(*args, seeds[ii]), output))

            for ii in range(config.threads)

                args=(genfens_command_builder(args, index), output))

            for index in range(threads)

        ]

        for process in processes:

            process.start()

        # Parse the Queue and save the content into Books/openbench.genfens.epd

        with open(os.path.join('Books', 'openbench.genfens.epd'), 'w') as fout:

            try: # Each process will deposit exactly N results into the Queue

                for iteration in range(N * config.threads):

                    fout.write(output.get(timeout=15) + '\n')

                    genfens_progress_bar(iteration+1, N * config.threads)

        try: # Each process will deposit exactly N results into the Queue

            for iteration in range(N * threads):

                args['output'].write(convert_fen_to_epd(output.get(timeout=15)) + '\n')

                genfens_progress_bar(iteration+1, N * threads)

            except queue.Empty: # Force kill the engine, thus causing the processes to finish

                kill_process_by_name(binary_name)

                raise OpenBenchFailedGenfensException('[%s] Stalled during genfens' % (binary_name))

        except queue.Empty: # Force kill the engine, thus causing the processes to finish

            utils.kill_process_by_name(binary_name)

            raise utils.OpenBenchFailedGenfensException('[%s] Stalled during genfens' % (binary_name))

            finally: # Join everything to avoid zombie processes

                for process in processes:

                    process.join()

        finally: # Join everything to avoid zombie processes

            for process in processes:

                process.join()

        print('\nFinished Building Opening Book in %.3f seconds' % (time.time() - start_time))

Client/pgn_util.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,8 @@ @@
     import re
     import sys
+    ## Local imports must only use "import x", never "from x import ..."
     # For use externally
     REGEX_COMMENT_VERBOSE  = r'(book|[+-]?M?\d+(?:\.\d+)? \d+/\d+ \d+ \d+)'
     REGEX_COMMENT_COMPACT  = r'(book|[+-]?M?\d+(?:\.\d+)?) \d+/\d+ \d+ \d+'
@@ Expand Down @@

Client/utils.py

-Original file line number
+Diff line change
@@ Expand Up / @@ -28,9 +28,17 @@ @@
     import tempfile
     import zipfile
+    ## Local imports must only use "import x", never "from x import ..."
     IS_WINDOWS = platform.system() == 'Windows' # Don't touch this
     IS_LINUX   = platform.system() != 'Windows' # Don't touch this
+    class OpenBenchFatalWorkerException(Exception):
+        def __init__(self, message):
+            self.message = 'Restarting Worker: ' + message
+            super().__init__(self.message)
     class OpenBenchBuildFailedException(Exception):
         def __init__(self, message, logs):
             self.message = message
@@ Expand Down Expand Up / @@ -73,9 +81,16 @@ def __init__(self, message): @@
             self.message = message
             super().__init__(self.message)
+    class OpenBenchMisssingPGNException(Exception):
+        def __init__(self, message):
+            self.message = message
+            super().__init__(self.message)
     def kill_process_by_name(process_name):
+        process_name = os.path.basename(process_name)
         if IS_LINUX:
             subprocess.run(['pkill', '-f', process_name])
@@ Expand Down @@

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update Episteme.json #32

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Update Episteme.json #32

Are you sure you want to change the base?

Uh oh!

Update Episteme.json #32

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!