66from  devito .ir .iet  import  (Transformer , MapNodes , Iteration , BlankLine ,
77                           DummyExpr , CallableBody , List , Call , Callable ,
88                           FindNodes , Section )
9- from  devito .symbolics  import  Byref , FieldFromPointer , Macro 
9+ from  devito .symbolics  import  Byref , FieldFromPointer , Macro ,  Null 
1010from  devito .types  import  Symbol , Scalar 
1111from  devito .types .basic  import  DataSymbol 
1212from  devito .tools  import  frozendict 
13- import  devito .logger   as   dl 
13+ import  devito .logger 
1414
1515from  devito .petsc .types  import  (PetscMPIInt , PetscErrorCode , MultipleFieldData ,
1616                                PointerIS , Mat , CallbackVec , Vec , CallbackMat , SNES ,
1717                                DummyArg , PetscInt , PointerDM , PointerMat , MatReuse ,
1818                                CallbackPointerIS , CallbackPointerDM , JacobianStruct ,
19-                                 SubMatrixStruct , Initialize , Finalize , ArgvSymbol ,
20-                                 GetArgs , ArgvSymbolPtr , ArgcPtr )
21- from  devito .petsc .types .macros  import  petsc_func_begin_user , Null 
19+                                 SubMatrixStruct , Initialize , Finalize , ArgvSymbol )
20+ from  devito .petsc .types .macros  import  petsc_func_begin_user 
2221from  devito .petsc .iet .nodes  import  PetscMetaData 
2322from  devito .petsc .utils  import  core_metadata , petsc_languages 
2423from  devito .petsc .iet .routines  import  (CBBuilder , CCBBuilder , BaseObjectBuilder ,
@@ -52,9 +51,6 @@ def lower_petsc(iet, **kwargs):
5251    if  any (filter (lambda  i : isinstance (i .expr .rhs , Finalize ), data )):
5352        return  finalize (iet ), core_metadata ()
5453
55-     if  any (filter (lambda  i : isinstance (i .expr .rhs , GetArgs ), data )):
56-         return  get_args (iet ), core_metadata ()
57- 
5854    unique_grids  =  {i .expr .rhs .grid  for  (i ,) in  inject_solve_mapper .values ()}
5955    # Assumption is that all solves are on the same grid 
6056    if  len (unique_grids ) >  1 :
@@ -73,7 +69,7 @@ def lower_petsc(iet, **kwargs):
7369    # Map PETScSolve to its Section (for logging) 
7470    section_mapper  =  MapNodes (Section , PetscMetaData , 'groupby' ).visit (iet )
7571
76-     # Prefixes within the same Operator should not be duplicated 
72+     # Prefixes within the same ` Operator`  should not be duplicated 
7773    prefixes  =  [d .expr .rhs .user_prefix  for  d  in  data  if  d .expr .rhs .user_prefix ]
7874    duplicates  =  {p  for  p  in  prefixes  if  prefixes .count (p ) >  1 }
7975
@@ -138,18 +134,6 @@ def finalize(iet):
138134    return  iet ._rebuild (body = finalize_body )
139135
140136
141- def  get_args (iet ):
142-     argc  =  ArgcPtr (name = 'argc' , dtype = np .int32 )
143-     argv  =  ArgvSymbolPtr (name = 'argv' )
144- 
145-     body  =  petsc_call ('PetscGetArgs' , [argc , argv ])
146-     body  =  CallableBody (
147-         body = (petsc_func_begin_user , body ),
148-         retstmt = (Call ('PetscFunctionReturn' , arguments = [0 ]),)
149-     )
150-     return  iet ._rebuild (body = body )
151- 
152- 
153137def  make_core_petsc_calls (objs , comm ):
154138    call_mpi  =  petsc_call_mpi ('MPI_Comm_size' , [comm , Byref (objs ['size' ])])
155139    return  call_mpi , BlankLine 
@@ -217,9 +201,9 @@ def solve(self):
217201
218202    @cached_property  
219203    def  logger (self ):
220-         log_level  =  dl .logger .level 
204+         log_level  =  devito . logger .logger .level 
221205        return  PetscLogger (
222-             log_level , self .get_info , ** self .common_kwargs 
206+             log_level , get_info = self .get_info , ** self .common_kwargs 
223207        )
224208
225209    @cached_property  
0 commit comments