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

--mfaktc and --mfakto prototype #24

Merged
merged 60 commits into from
Aug 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
a692a7e
Updated GpuOwl notebook to install the old Nvidia drivers.
tdulcet Jul 9, 2024
fbd00d1
First pass at adding MfaktX to primenet.py
brubsby Jul 16, 2024
56c1059
Add mfaktx result.txt to json translation, and tf ar api mapping rules
brubsby Jul 17, 2024
39e2f82
Fix factor reporting, other bugfixes
brubsby Jul 17, 2024
be72bae
Merge remote-tracking branch 'upstream/master'
brubsby Jul 17, 2024
40c05ae
Rough draft of PrimeNet program version 2.2. [skip ci]
tdulcet Jul 17, 2024
75f53e8
Merge remote-tracking branch 'upstream/primenet-2.2'
brubsby Jul 17, 2024
9889f40
undo pfactor parsing removal typo
brubsby Jul 18, 2024
582ae64
Added code to parse checkpoint files for mfaktc/mfakto.
tdulcet Jul 20, 2024
736810d
Add mfaktc work estimation
brubsby Jul 20, 2024
21a6175
Add support for new GPU TF work pref
brubsby Jul 23, 2024
e63c491
Updated PrimeNet program to version 2.2.
tdulcet Jul 23, 2024
0286e63
Merge remote-tracking branch 'upstream/primenet-2.2'
brubsby Jul 23, 2024
ebbf666
Fix Merge, change results file default for mfaktc
brubsby Jul 23, 2024
d8af14e
Fix work estimation by removing msec_per_iter scaling for exponent di…
brubsby Jul 23, 2024
4a66163
Update TF work estimation to use bit_level_time from the 0.23-beta.4 …
brubsby Jul 24, 2024
d0e105d
Update defaults and --setup behavior for TF
brubsby Jul 24, 2024
ef15996
First try on fixing quantity of assignments fetched for TF
brubsby Jul 25, 2024
5e340d6
Get 10 TF assignments on first run (num_cache == 0)
brubsby Jul 25, 2024
eba88f9
More debug messages about num_cache.
brubsby Jul 25, 2024
fa6a335
Fix grammatical agreement for corner cases in get_assignments
brubsby Jul 25, 2024
4ed942c
Don't send d=1 when more TF bitlevels are in worktodo.txt
brubsby Jul 25, 2024
ca7ad42
Fixed --num-cache option and removed unused code. [skip ci]
tdulcet Jul 27, 2024
38fa38f
Fix error from using float in range
brubsby Jul 28, 2024
e2d05aa
more debug lines for num_cache
brubsby Jul 29, 2024
e4f6c13
fix cert_work = False in .ini causing error
brubsby Jul 29, 2024
d090d39
attempt to fix bald factor reporting and missing factors
brubsby Jul 30, 2024
cd314e0
help rom
brubsby Jul 31, 2024
5fd82d7
update various texts in response to user testing
brubsby Aug 1, 2024
19a0018
use newly suggested method of multiple factor reporting via API
brubsby Aug 1, 2024
73dde02
add specific message for no cli flags no .ini case
brubsby Aug 1, 2024
f96750c
clarify SMTP server requirement in --setup
brubsby Aug 1, 2024
1ef4836
Update authorship line in file docstring
brubsby Aug 1, 2024
755701f
first attempt at a status message after timeout/checkin completes
brubsby Aug 2, 2024
3ea015e
add MaxExponents defaults
brubsby Aug 2, 2024
6917818
add results_file default in config
brubsby Aug 2, 2024
e73d4d8
remove microseconds from format string
brubsby Aug 2, 2024
db5c159
Merge remote-tracking branch 'upstream/primenet-2.2'
brubsby Aug 3, 2024
11930f8
fix merge
brubsby Aug 3, 2024
fe02b06
regenerate worktype table
brubsby Aug 3, 2024
50ef3e1
add TF levels to exponent_to_str
brubsby Aug 3, 2024
ea13cc7
add --setup epilogue message
brubsby Aug 3, 2024
0f4dbf6
change default days_of_work for TF to 1.0, permit fractional values i…
brubsby Aug 3, 2024
fe7670d
add type hints for config parsing for options without optparse defaults
brubsby Aug 4, 2024
3a94aa4
add helpful tips to usage message
brubsby Aug 4, 2024
31f8b55
fix setup epilogue help invocation
brubsby Aug 4, 2024
f91a1f8
remove Wh from TF no factor result string. fix stage/percentage repor…
brubsby Aug 5, 2024
7c44944
usability testing feedback tweaks
brubsby Aug 5, 2024
883de51
don't merge multi-line qualified success logging message
brubsby Aug 5, 2024
ea2d445
change next check log message to locale formatting
brubsby Aug 5, 2024
633da55
attempt a fancy python invocation detection
brubsby Aug 8, 2024
eb06151
mfakto fail condition and timedeltastr
brubsby Aug 8, 2024
6e407a2
Removed remaining uses of Wh from result output.
tdulcet Aug 9, 2024
a73517c
attempt to support mfakto
brubsby Aug 10, 2024
e83d237
Merge remote-tracking branch 'origin/master'
brubsby Aug 10, 2024
6bbc15f
Fix and add more option type hits.
tdulcet Aug 10, 2024
397cd6b
add "louder" stall warning, attempt to fix logging during network errors
brubsby Aug 15, 2024
c6ae513
remove dash from TF no factor message when no security code
brubsby Aug 16, 2024
5100940
fix factora message
brubsby Aug 18, 2024
acae2af
Updated to no longer install the Requests library. [skip ci]
tdulcet Aug 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions primenet.py
Original file line number Diff line number Diff line change
Expand Up @@ -5686,6 +5686,10 @@ def ping_server(ping_type=1):
return None


def is_pyinstaller():
return getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS')
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This seems to be the canonical way to determine whether we're in a pyinstaller instance, so I've added it.

https://pyinstaller.org/en/stable/runtime-information.html

Copy link
Owner

Choose a reason for hiding this comment

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

For future reference, I added this link to a comment in the function.



#######################################################################################################
#
# Start main program here
Expand Down Expand Up @@ -6302,6 +6306,15 @@ def ping_server(ping_type=1):
register_instance(guid)
if options.fromemail and options.smtp:
test_msg(guid)
logging.info("\nSetup for this instance of {0} is now complete.\n"
"To monitor the current directory for {2} results, run this program again as: \"{1}\"\n"
"If your instance of {2} is in a different directory, run this program with: \"{1} -D <{2} dirpath>\"\n"
"Then, start {2} as normal, and {0} will report results and fetch work periodically.\n"
"For a list of all options run: \"{0} --help\"".format(
"primenet.exe" if is_pyinstaller() else "primenet.py",
"primenet.exe" if is_pyinstaller() else "python primenet.py",
PROGRAM["name"],
))
sys.exit(0)

if options.timeout > options.hours_between_checkins * 60 * 60:
Expand Down