diff --git a/examples/full_evolution_with_plot.py b/examples/full_evolution_with_plot.py index 02cf4fd511e78ba83a9a55abd5d965882c833b0f..db31057cb9a9a44a537856c0b67edd7b0a9b22cc 100644 --- a/examples/full_evolution_with_plot.py +++ b/examples/full_evolution_with_plot.py @@ -1,10 +1,10 @@ import os, sys import matplotlib.pyplot as plt -import binary_c - # Append root dir of this project to include functionality sys.path.append(os.path.dirname(os.getcwd())) +import binary_c + from utils.defaults import physics_defaults from utils.functions import create_arg_string @@ -70,4 +70,4 @@ results = example_with_loading_default_args() plt.plot(results['time'], results['mass']) plt.plot(results['time'], results['mass2']) plt.xscale('log') -plt.show() \ No newline at end of file +plt.show() diff --git a/examples/simple_test.py b/examples/simple_test.py new file mode 100644 index 0000000000000000000000000000000000000000..75191f5bcc984c7a8df7430b2d36721ce987e726 --- /dev/null +++ b/examples/simple_test.py @@ -0,0 +1,31 @@ +#!/usr/bin/python3 +import os +import sys + +# Append root dir of this project to include functionality +sys.path.append(os.path.dirname(os.getcwd())) +import binary_c + +from utils.defaults import physics_defaults +from utils.functions import create_arg_string + + +def run_test_binary(): + m1 = 15.0 # Msun + m2 = 14.0 # Msun + separation = 0 # 0 = ignored, use period + orbital_period = 4530.0 # days + eccentricity = 0.0 + metallicity = 0.02 + max_evolution_time = 15000 + buffer = "" + # argstring = "binary_c M_1 {0:g} M_2 {1:g} separation {2:g} orbital_period {3:g} eccentricity {4:g} metallicity {5:g} max_evolution_time {6:g} ".format(m1,m2,separation,orbital_period,eccentricity,metallicity,max_evolution_time) + + argstring = f"binary_c M_1 {m1} M_2 {m2} separation {separation} orbital_period {orbital_period} eccentricity {eccentricity} metallicity {metallicity} max_evolution_time {max_evolution_time}" + + output = binary_c.run_binary(argstring) + + # print ("Binary_c output:\n\n") + print (output) + +run_test_binary() diff --git a/snippets/d.py b/snippets/d.py new file mode 100644 index 0000000000000000000000000000000000000000..ea3c6bdf3dcec9316ea339a28a430f4ea8716afd --- /dev/null +++ b/snippets/d.py @@ -0,0 +1,25 @@ +import multiprocessing +import time + + +def doubler(number): + return number ** 2 + +def count(number): + nr = 0 + for i in range(number): + nr += i + return number + +if __name__ == '__main__': + numbers = range(2, 100000) + pool = multiprocessing.Pool(processes=6) + # print() + + rs = pool.map_async(pool.map(count, numbers), range(len(numbers))) + pool.close() # No more work + while (True): + if (rs.ready()): break + remaining = rs._number_left + print("Waiting for", remaining, "tasks to complete...") + time.sleep(0.5) \ No newline at end of file diff --git a/snippets/mp2.py b/snippets/mp2.py new file mode 100644 index 0000000000000000000000000000000000000000..a7c9bc0653af00e95ccea144ce2918bf41fdbbf6 --- /dev/null +++ b/snippets/mp2.py @@ -0,0 +1,17 @@ +import time + +def basic_func(x): + if x == 0: + return 'zero' + elif x%2 == 0: + return 'even' + else: + return 'odd' + +starttime = time.time() +for i in range(0,10): + y = i*i + time.sleep(2) + print('{} squared results in a/an {} number'.format(i, basic_func(y))) + +print('That took {} seconds'.format(time.time() - starttime)) \ No newline at end of file diff --git a/snippets/mp3.py b/snippets/mp3.py new file mode 100644 index 0000000000000000000000000000000000000000..3e7b748bb44658a1e793b63e677c1a8e8f0ed4ec --- /dev/null +++ b/snippets/mp3.py @@ -0,0 +1,28 @@ +import time +import multiprocessing + +def basic_func(x): + if x == 0: + return 'zero' + elif x%2 == 0: + return 'even' + else: + return 'odd' + +def multiprocessing_func(x): + y = x*x + time.sleep(2) + print('{} squared results in a/an {} number'.format(x, basic_func(y))) + +if __name__ == '__main__': + starttime = time.time() + processes = [] + for i in range(0,100): + p = multiprocessing.Process(target=multiprocessing_func, args=(i,)) + processes.append(p) + p.start() + + for process in processes: + process.join() + + print('That took {} seconds'.format(time.time() - starttime)) \ No newline at end of file diff --git a/snippets/mp3_pool.py b/snippets/mp3_pool.py new file mode 100644 index 0000000000000000000000000000000000000000..9b40efd977f4af9006499cdd597f02e808d39dd5 --- /dev/null +++ b/snippets/mp3_pool.py @@ -0,0 +1,23 @@ +import time +import multiprocessing +# https://medium.com/@urban_institute/using-multiprocessing-to-make-python-code-faster-23ea5ef996ba +def basic_func(x): + if x == 0: + return 'zero' + elif x%2 == 0: + return 'even' + else: + return 'odd' + +def multiprocessing_func(x): + y = x*x + time.sleep(2) + print('{} squared results in a/an {} number'.format(x, basic_func(y))) + +if __name__ == '__main__': + + starttime = time.time() + pool = multiprocessing.Pool() + pool.map(multiprocessing_func, range(0,10)) + pool.close() + print('That took {} seconds'.format(time.time() - starttime)) \ No newline at end of file diff --git a/snippets/multiprocessing_test.py b/snippets/multiprocessing_test.py new file mode 100644 index 0000000000000000000000000000000000000000..5c56076fb430a1cfc344113f2d29ba33acac3ed5 --- /dev/null +++ b/snippets/multiprocessing_test.py @@ -0,0 +1,30 @@ +from multiprocessing import Process, Queue +import time +import sys + +def reader_proc(queue): + ## Read from the queue; this will be spawned as a separate Process + while True: + msg = queue.get() # Read from the queue and do nothing + if (msg == 'DONE'): + break + +def writer(count, queue): + ## Write to the queue + for ii in range(0, count): + queue.put(ii) # Write 'count' numbers into the queue + queue.put('DONE') + +if __name__=='__main__': + pqueue = Queue() # writer() writes to pqueue from _this_ process + for count in [10**4, 10**5, 10**6]: + ### reader_proc() reads from pqueue as a separate process + reader_p = Process(target=reader_proc, args=((pqueue),)) + reader_p.daemon = True + reader_p.start() # Launch reader_proc() as a separate python process + + _start = time.time() + writer(count, pqueue) # Send a lot of stuff to reader() + reader_p.join() # Wait for the reader to finish + print("Sending {0} numbers to Queue() took {1} seconds".format(count, + (time.time() - _start))) \ No newline at end of file diff --git a/utils/__pycache__/defaults.cpython-36.pyc b/utils/__pycache__/defaults.cpython-36.pyc index d364497266246ceb5cb898c81ad256338ab74946..75dc43827c0ace49de412172751239d914728d56 100644 Binary files a/utils/__pycache__/defaults.cpython-36.pyc and b/utils/__pycache__/defaults.cpython-36.pyc differ diff --git a/utils/__pycache__/functions.cpython-36.pyc b/utils/__pycache__/functions.cpython-36.pyc index 16a46b9804ec090a27bc98609a51840fce995f10..a3eb089d85c41acd3410cd12ea452e7e7afbebf0 100644 Binary files a/utils/__pycache__/functions.cpython-36.pyc and b/utils/__pycache__/functions.cpython-36.pyc differ