Run from any directory, use filters as a CLI option

MathIsFun0 · MathIsFun0 · commit e456eafa7593 · 2024-03-14T00:31:27.000-04:00
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "time.h": "c"
+    }
+}
diff --git a/docs/getting_started.md b/docs/getting_started.md
@@ -7,9 +7,10 @@ Open the Immolate CLI in the directory you extracted Immolate to.
 To check that Immolate works, run the command `immolate -h`. You should see a help dialog that lists all of the command-line arguments to pass into the searcher.
 
 ## Running an existing filter
-To run an existing filter, open the file `search.cl`. The first line will look something like `#include "filters/red_poly_glass.cl"`. Replace the text in quotes with the path to a file that contains a filter.
+To run an existing filter, type the name of the filter after the `-f` option, e.g. `immolate -f double_legendary`.
 
 To run the executable, there are a few command line arguments that may be important.
+- `-f`: Sets the filter used by the search.
 - `-s`: Sets the starting seed of the search.
 - `-n`: Sets the number of seeds of the search.
 - `-c`: Sets the score the filter needs to return for a seed to be printed. Useful when searching for streaks or seeds that must meet a variety of conditions.
diff --git a/filters/bad_seeds.cl b/filters/bad_seeds.cl
@@ -1,5 +1,5 @@
 // Seeds with very little rare / uncommon jokers in first 4 ante
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 
 int find_non_common_jokers(instance* inst, rsrc jokerSource, int ante, int amountToCheck) {
     int totalNonCommonJokers = 0;
diff --git a/filters/buggy_erratic.cl b/filters/buggy_erratic.cl
@@ -1,5 +1,5 @@
 // Searches for seeds with glitched erratic decks
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     double node = get_node_child(inst, (__private ntype[]){N_Type}, (__private int[]){R_Erratic}, 1);
     if (node >= 0 && node <= 1) return 0;
diff --git a/filters/buggy_seeds.cl b/filters/buggy_seeds.cl
@@ -1,5 +1,5 @@
 // Searches for glitched seeds
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     double node = inst->hashedSeed;
     if (node >= 0 && node <= 1) return 0;
diff --git a/filters/double_legendary.cl b/filters/double_legendary.cl
@@ -1,5 +1,5 @@
 // Searches for a first shop with two packs that give legendary jokers
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     int score = 0;
     for (int packIndex = 1; packIndex <= 2; packIndex++) {
diff --git a/filters/emperor_fool.cl b/filters/emperor_fool.cl
@@ -1,5 +1,5 @@
 // Emperor-Fool Chains
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 
 long filter(instance* inst) {
     int bestAnte = 0;
diff --git a/filters/erratic_flush_five.cl b/filters/erratic_flush_five.cl
@@ -1,5 +1,5 @@
 // Searches for an Erratic Deck seed with lots of an exact card
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     set_deck(inst, Erratic_Deck);
     int scores[52];
diff --git a/filters/erratic_ranks.cl b/filters/erratic_ranks.cl
@@ -1,5 +1,5 @@
 // Searches for an Erratic Deck seed with lots of a rank
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     set_deck(inst, Erratic_Deck);
     int16 scores;
diff --git a/filters/erratic_suits.cl b/filters/erratic_suits.cl
@@ -1,5 +1,5 @@
 // Searches for an Erratic Deck seed with lots of a type of suit
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     set_deck(inst, Erratic_Deck);
     int4 scores;
diff --git a/filters/four_deadly_jokers.cl b/filters/four_deadly_jokers.cl
@@ -1,5 +1,5 @@
 // Searches for a first shop buffoon pack with the four jokers that give increased mult to suits.
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     // Buffoon Pack of Size 4
     bool suitablePack = false;
diff --git a/filters/high_score_demo.cl b/filters/high_score_demo.cl
@@ -1,5 +1,5 @@
 // Searches for a seed with a good setup for high score world record runs
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     int passedFilters = 0;
 
diff --git a/filters/legendary_skip.cl b/filters/legendary_skip.cl
@@ -1,5 +1,5 @@
 // Legendary joker from arcana pack skip ante 1.
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 
 long filter(instance* inst) {
     // Charm Tag Ante 1
diff --git a/filters/low_percent.cl b/filters/low_percent.cl
@@ -1,5 +1,5 @@
 // Searches for a seed that can be beaten with 6 hands and 0 discards
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     init_locks(inst, 1, false, true);
     int passedFilters = 0;
diff --git a/filters/max_cash_ante_1.cl b/filters/max_cash_ante_1.cl
@@ -1,5 +1,5 @@
 // Maximum cash out possible in Ante 1
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
     
diff --git a/filters/most_jokers.cl b/filters/most_jokers.cl
@@ -4,7 +4,7 @@
 // 3 -> which pack has perkeo (ante 1, from left to right, 3 means 2nd shop, first pack)
 // 4 -> ante that has ankh (within first 8 items in shop)
 // 1 -> ante that has ectoplasm (within first 8 items in shop)
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 
 // In which pack ante 1 you get soul (if all packs are opened one after another from left to right)
 int get_soul_index(instance* inst, int ante) {
diff --git a/filters/purchaseless.cl b/filters/purchaseless.cl
@@ -1,5 +1,5 @@
 // Purchaseless runs
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
     init_locks(inst, 2, false, true);
diff --git a/filters/red_poly_glass.cl b/filters/red_poly_glass.cl
@@ -1,5 +1,5 @@
 // Red Poly Glass Cards
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     int numCards = 0;
     // Check if either pack is a Standard Pack - and which has the most cards
diff --git a/filters/showman_emperor_fool.cl b/filters/showman_emperor_fool.cl
@@ -5,7 +5,7 @@
 // 2 -> showman appears ante 2 (in first 6 shop items or in a buffoon pack)
 // 3 -> emperor appears ante 3  (in first 6 shop items)
 // 4 -> best ante to use emperor
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
   
 bool is_chained(bool hasShowman, item tarot) {
     return tarot == The_Fool || (hasShowman && tarot == The_Emperor);
diff --git a/filters/speedrun.cl b/filters/speedrun.cl
@@ -1,5 +1,5 @@
 // Speedrunning seeds for Set Seed Skips
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 
 long filter(instance* inst) {
     // The primary strategy utilized is going to be a single Bull carrying the run.
diff --git a/filters/speedrun_skipless.cl b/filters/speedrun_skipless.cl
@@ -1,5 +1,5 @@
 // Speedrunning seeds for Set Seed Skips
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 long filter(instance* inst) {
     long passedFilters = 0;
 
diff --git a/filters/straight_flushes.cl b/filters/straight_flushes.cl
@@ -1,4 +1,4 @@
-#include "./lib/immolate.cl"
+#include "lib/immolate.cl"
 // Checks if the first two blinds of Ante 1 have straight flushes
 long filter(instance* inst) {
     item deck[52];
diff --git a/immolate.c b/immolate.c
@@ -12,17 +12,22 @@ int main(int argc, char **argv) {
     for (int i = 0; i < 8; i++) {
         startingSeed.s[i] = '\0';
     };
-    cl_long numSeeds = 2251875390625;
+    cl_long numSeeds = 2318107019761;
     cl_long cutoff = 1;
+    char* filter = "erratic_flush_five";
     for (int i = 0; i < argc; i++) {
         if (strcmp(argv[i], "-h")==0) {
-            printf_s("Valid command line arguments:\n-h        Shows this help dialog.\n-s <S>    Sets the starting seed to S. Defaults to empty seed. Use \"random\" for a random starting seed.\n-n <N>    Sets the number of seeds to search to N. Defaults to full seed pool.\n-c <C>    Sets the cutoff score for a seed to be printed to C. Defaults to 1.\n-p <P>    Sets the platform ID of the CL device being used to P. Defaults to 0.\n-d <D>    Sets the device ID of the CL device being used to D. Defaults to 0.\n-g <G>    Sets the number of thread groups to G. Defaults to 16. Increasing this might help Immolate run faster.\n\n--list_devices   Lists information about the detected CL devices.");
+            printf_s("Valid command line arguments:\n-h        Shows this help dialog.\n-f <F>    Sets the filter used by Immolate to F. Defaults to erratic_flush_five.\n-s <S>    Sets the starting seed to S. Defaults to empty seed. Use \"random\" for a random starting seed.\n-n <N>    Sets the number of seeds to search to N. Defaults to full seed pool.\n-c <C>    Sets the cutoff score for a seed to be printed to C. Defaults to 1.\n-p <P>    Sets the platform ID of the CL device being used to P. Defaults to 0.\n-d <D>    Sets the device ID of the CL device being used to D. Defaults to 0.\n-g <G>    Sets the number of thread groups to G. Defaults to 16. Increasing this might help Immolate run faster.\n\n--list_devices   Lists information about the detected CL devices.");
             return 0;
         }
         if (strcmp(argv[i],  "-p")==0) {
             platformID = atoi(argv[i+1]);
             i++;
         }
+        if (strcmp(argv[i],  "-f")==0) {
+            filter = argv[i+1];
+            i++;
+        }
         if (strcmp(argv[i],  "-d")==0) {
             deviceID = atoi(argv[i+1]);
             i++;
@@ -125,15 +130,47 @@ int main(int argc, char **argv) {
     // Load the kernel source code into the array ssKernel
     FILE *fp;
     char *ssKernelCode;
+    char *ssKernelBuf;
     size_t ssKernelSize;
- 
-    fp = fopen("search.cl", "r");
+
+    // Get CWD
+    char executable_dir[MAX_PATH];
+    char include_path[MAX_PATH+6];
+    char kernel_path[MAX_PATH+12];
+    if (GetModuleFileName(NULL, executable_dir, MAX_PATH) != 0) {
+        char* last_slash = strrchr(executable_dir, '\\');
+        if (last_slash != NULL) {
+            *last_slash = '\0';
+        }
+    } else {
+        fprintf(stderr, "Error: Unable to get the current working directory\n");
+    }
+    strcpy_s(include_path, sizeof include_path, "-I \"");
+    strcat_s(include_path, sizeof include_path, executable_dir);
+    strcat_s(include_path, sizeof include_path, "\"");
+    strcpy_s(kernel_path, sizeof kernel_path, executable_dir);
+    strcat_s(kernel_path, sizeof kernel_path, "\\search.cl");
+    fp = fopen(kernel_path, "r");
     if (!fp) {
-        fprintf_s(stderr, "Failed to load kernel.\n");
-        exit(1);
+        printf_s("Warning: Kernel not found at ");
+        printf_s(kernel_path);
+        printf_s(", attempting working directory...\n");
+        fp = fopen("search.cl","r");
+        if (!fp) {
+            fprintf_s(stderr, "Failed to load kernel.\n");
+            exit(1);
+        }
     }
     ssKernelCode = (char*)malloc(1000000);
-    ssKernelSize = fread( ssKernelCode, 1, 1000000, fp);
+    ssKernelBuf = (char*)malloc(1000000);
+    // Set include information
+    strcpy_s(ssKernelCode, 1000000, "#include \"filters/");
+    strcat_s(ssKernelCode, 1000000, filter);
+    strcat_s(ssKernelCode, 1000000, ".cl\"\n\n");
+    size_t bytes_read = fread( ssKernelBuf, 1, 1000000, fp);
+    ssKernelBuf[bytes_read] = '\0';
+    strcat_s(ssKernelCode, 1000000, ssKernelBuf);
+    ssKernelSize = strlen(ssKernelCode);
     fclose( fp );
 
     // Set up platform and device based on CLI args
@@ -194,7 +231,7 @@ int main(int argc, char **argv) {
 
     // Build the program
     printf_s("Building program...\n");
-    err = clBuildProgram(ssKernelProgram, 1, &device, "", NULL, NULL);
+    err = clBuildProgram(ssKernelProgram, 1, &device, include_path, NULL, NULL);
     if (err == CL_BUILD_PROGRAM_FAILURE) { //print build log on error
         size_t logLength = 0;
         err = clGetProgramBuildInfo(ssKernelProgram, device, CL_PROGRAM_BUILD_LOG, 0, NULL, &logLength);
diff --git a/lib/immolate.cl b/lib/immolate.cl
@@ -7,10 +7,10 @@
     #define VER4 14 //1.0.0n
     #define GAME_VERSION
 #endif
-#include "./lib/util.cl" // Contains utility functions
-#include "./lib/seed.cl" // Contains seed/seed list info
-#include "./lib/items.cl" // Contains item enums, lists, helper functions
-#include "./lib/debug.cl" // Debug printing functions
-#include "./lib/cache.cl" // Contains RNG Cache implementation
-#include "./lib/instance.cl" // Contains random instance implementation and core functions
+#include "lib/util.cl" // Contains utility functions
+#include "lib/seed.cl" // Contains seed/seed list info
+#include "lib/items.cl" // Contains item enums, lists, helper functions
+#include "lib/debug.cl" // Debug printing functions
+#include "lib/cache.cl" // Contains RNG Cache implementation
+#include "lib/instance.cl" // Contains random instance implementation and core functions
 #include "functions.cl" // Contains utility functions for searching seeds - what the user would interact with
diff --git a/lib/immolate.h b/lib/immolate.h
@@ -1,6 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
+#include <windows.h>
+#include <limits.h>
+#include <string.h>
 #include <CL/cl.h>
 void clErrCheck(cl_int err, char* msg) {
     if (err != CL_SUCCESS) {
diff --git a/search.cl b/search.cl
@@ -1,5 +1,3 @@
-#include "./filters/bad_seeds.cl"
-
 __kernel void search(char8 starting_seed, long num_seeds, __global long* filter_cutoff) {
     seed _seed = s_new_c8(starting_seed);
     if (get_global_id(0) != 0) {

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +{
 +    "files.associations": {
 +        "time.h": "c"
 +    }
 +}