Commit a85232a9 authored by Tharrington, Arnold's avatar Tharrington, Arnold
Browse files

Latest update.

parent 8baa0a00

bin/build_namd.py

+5 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import argparse # Needed for parsing command line arguments. 
from loggerutils.logger import create_logger_description

from loggerutils.logger import create_logger

import namd_machine_registrations

import namd_machine_builds



def main():

    mr =  _register_machines_buildtargets()
@@ -79,10 +80,11 @@ def _register_machines_buildtargets(): 
    # Register Crusher

    reg_mach = namd_machine_registrations.NamdBuildRegister()



    builder1 = lambda x,y : print(f"Building {y} on {x}")  

    namd_machine_registrations.register_new_machine(reg_mach,'Crusher')

    namd_machine_registrations.register_new_build(reg_mach,machine_name='Crusher',build_target='Multicore',builder=builder1)

    namd_machine_registrations.build_software(reg_mach,machine_name='Crusher',build_target="Multicore")

    kargs_bt = {"machine_name" : 'Crusher','build_target' : 'Multicore'}

    builder1 = namd_machine_builds.get_builder(**kargs_bt)

    namd_machine_registrations.register_new_build(reg_mach,**kargs_bt,builder=builder1)

    namd_machine_registrations.build_software(reg_mach,**kargs_bt)





    return reg_mach

bin/lib/__init__.py

+2 −1
Original line number Diff line number Diff line
@@ -4,4 +4,5 @@ __all__ = ["lmod_interface", 
           "loggerutils",

           "pathoption",

           "namd_machine_registration",

           "namd_machine_builds",]
 
           "namd_machine_builds",

           "namd_builders.py",]

bin/lib/namd_machine_builds.py

+12 −17
Original line number Diff line number Diff line 
#! /usr/bin/env python3

"""Contains the builders for all machines



"""Contains various functions for building NAMD"""

This module contains the callable builder classes for all mcnhines and the their targets.

All new machine builders should be added in this module. 





"""



# System imports

import string
@@ -10,23 +14,17 @@ import logging # Needed for logging events. 
# Local imports

from loggerutils.logger import create_logger_description

from loggerutils.logger import create_logger

from namd_builders import GenericNAMDBuilder 



class NAMDBuilder:

    def __init__(self):

        pass



    def __call__(self,*args,**kwargs):

        print("Building NAMD binary via NAMDbUILDER")

# Make a dictionary of all Crusher build_targets and the corresponding builder.

_crusher_builders = {"Multicore" : GenericNAMDBuilder }



# List of all Crusher build_targets and builders

crusher_build_config = [ {"Multicore" : NAMDBuilder}, ]



# List of all machines.

all_machines = {"Crusher": crusher_build_config }

# Make a dictionary of  builders for all machines.

_all_machine_builders = {"Crusher": _crusher_builders }



def get_builder(machine_name="",build_target=""):

    """Returns the a callable class that builds NAMD"""

    return NAMDBuilder()

    return GenericNAMDBuilder()



def main():

    args = _parse_arguments()
@@ -59,6 +57,3 @@ def _parse_arguments(): 
    my_args = my_parser.parse_args()



    return my_args 


if __name__ == "__main__":

    main()

bin/lib/namd_machine_registrations.py

+1 −1
Original line number Diff line number Diff line
@@ -136,5 +136,5 @@ class NamdBuildRegister(): 


    def build(self,machine_name,build_target):

        """ """

        self._builder[machine_name][build_target](machine_name,build_target)

        self._builder[machine_name][build_target](machine_name=machine_name,build_target=build_target)

        return

charm @ 714b731d

Compare 45b20de6 to 714b731d
Original line number Diff line number Diff line 
Subproject commit 45b20de6e61e648d75c7793f6a464ddc0a5f876c
 
Subproject commit 714b731d45959d1686997455841ae221be4f4aec