Patch: Integrate src/IO.
Jeffrey Oldham
oldham at codesourcery.com
Fri Sep 14 23:15:22 UTC 2001
Yesterday, Scott Haney added the IO directory. This patch adds the
makefile infrastructure to include the files in the Pooma library and
to compile the IO regression tests.
2001-09-14 Jeffrey D. Oldham <oldham at codesourcery.com>
* subdir.mk: Add IO directory to collection.
* IO/FileSetWriter.h (FileSetWriter<Dim>::write): Add missing
'typename's.
* IO/include.mk: New file.
* IO/objfile.mk: Likewise.
* IO/tests/include.mk: Likewise.
* IO/tests/makefile: Likewise.
Tested on sequential Linux using gcc3.1 by compiling Pooma library and IO tests
Approved by Stephen Smith
Applied to mainline
Thanks,
Jeffrey D. Oldham
oldham at codesourcery.com
-------------- next part --------------
Index: subdir.mk
===================================================================
RCS file: /home/pooma/Repository/r2/src/subdir.mk,v
retrieving revision 1.19
diff -c -p -r1.19 subdir.mk
*** subdir.mk 2001/08/30 01:14:57 1.19
--- subdir.mk 2001/09/14 22:05:56
*************** NEXTDIR := Engine
*** 45,50 ****
--- 45,54 ----
include $(THISDIR)/$(NEXTDIR)/include.mk
THISDIR :=$(firstword $(DIR_LIST))
+ NEXTDIR := IO
+ include $(THISDIR)/$(NEXTDIR)/include.mk
+ THISDIR :=$(firstword $(DIR_LIST))
+
NEXTDIR := Layout
include $(THISDIR)/$(NEXTDIR)/include.mk
THISDIR :=$(firstword $(DIR_LIST))
Index: IO/FileSetWriter.h
===================================================================
RCS file: /home/pooma/Repository/r2/src/IO/FileSetWriter.h,v
retrieving revision 1.3
diff -c -p -r1.3 FileSetWriter.h
*** IO/FileSetWriter.h 2001/09/14 21:20:27 1.3
--- IO/FileSetWriter.h 2001/09/14 22:05:59
*************** void FileSetWriter<Dim>::write(Subject &
*** 271,279 ****
// Create an array to receive the data. Make this
// remote (owned by the I/O context) and compressible.
! Array<Dim, Subject::Element_t, Remote<CompressibleBrick> > a;
a.engine() =
! Engine<Dim, Subject::Element_t, Remote<CompressibleBrick> >
(ioContext_m, d);
// Assign to the array to get the data. One might be able
--- 271,279 ----
// Create an array to receive the data. Make this
// remote (owned by the I/O context) and compressible.
! Array<Dim, typename Subject::Element_t, Remote<CompressibleBrick> > a;
a.engine() =
! Engine<Dim, typename Subject::Element_t, Remote<CompressibleBrick> >
(ioContext_m, d);
// Assign to the array to get the data. One might be able
Index: IO/include.mk
===================================================================
RCS file: include.mk
diff -N include.mk
*** /dev/null Tue May 5 14:32:27 1998
--- include.mk Fri Sep 14 16:05:59 2001
***************
*** 0 ****
--- 1,53 ----
+ # Generated by mm.pl: Wed Mar 11 22:10:45 MST 1998
+ # ACL:license
+ # ----------------------------------------------------------------------
+ # This software and ancillary information (herein called "SOFTWARE")
+ # called POOMA (Parallel Object-Oriented Methods and Applications) is
+ # made available under the terms described here. The SOFTWARE has been
+ # approved for release with associated LA-CC Number LA-CC-98-65.
+ #
+ # Unless otherwise indicated, this SOFTWARE has been authored by an
+ # employee or employees of the University of California, operator of the
+ # Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
+ # the U.S. Department of Energy. The U.S. Government has rights to use,
+ # reproduce, and distribute this SOFTWARE. The public may copy, distribute,
+ # prepare derivative works and publicly display this SOFTWARE without
+ # charge, provided that this Notice and any statement of authorship are
+ # reproduced on all copies. Neither the Government nor the University
+ # makes any warranty, express or implied, or assumes any liability or
+ # responsibility for the use of this SOFTWARE.
+ #
+ # If SOFTWARE is modified to produce derivative works, such modified
+ # SOFTWARE should be clearly marked, so as not to confuse it with the
+ # version available from LANL.
+ #
+ # For more information about POOMA, send e-mail to pooma at acl.lanl.gov,
+ # or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
+ # ----------------------------------------------------------------------
+ # ACL:license
+
+
+ # Wrap make components from SHARED_ROOT and the current directory in the
+ # proper order so that variables like ODIR have the correct directory-specific
+ # value at the right moment. See the included files for details of what they
+ # are doing. This file should NOT be manually edited.
+
+ # Set NEXTDIR, THISDIR and DIR_LIST
+ include $(SHARED_ROOT)/include1.mk
+
+ # Include list of subdirectories to process
+ -include $(THISDIR)/subdir.mk
+
+ # Set list of object files, relative to ODIR
+ -include $(THISDIR)/objfile.mk
+
+ # Remove current dir from DIR_LIST
+ DIR_LIST :=$(filter-out $(firstword $(DIR_LIST)), $(DIR_LIST))
+
+
+ # ACL:rcsinfo
+ # ----------------------------------------------------------------------
+ # $RCSfile: include.mk,v $ $Author: oldham $
+ # $Revision: 1.1 $ $Date: 2001/08/30 01:15:07 $
+ # ----------------------------------------------------------------------
+ # ACL:rcsinfo
Index: IO/objfile.mk
===================================================================
RCS file: objfile.mk
diff -N objfile.mk
*** /dev/null Tue May 5 14:32:27 1998
--- objfile.mk Fri Sep 14 16:05:59 2001
***************
*** 0 ****
--- 1,49 ----
+ # Generated by mm.pl: Wed Mar 11 22:10:45 MST 1998
+ # ACL:license
+ # ----------------------------------------------------------------------
+ # This software and ancillary information (herein called "SOFTWARE")
+ # called POOMA (Parallel Object-Oriented Methods and Applications) is
+ # made available under the terms described here. The SOFTWARE has been
+ # approved for release with associated LA-CC Number LA-CC-98-65.
+ #
+ # Unless otherwise indicated, this SOFTWARE has been authored by an
+ # employee or employees of the University of California, operator of the
+ # Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
+ # the U.S. Department of Energy. The U.S. Government has rights to use,
+ # reproduce, and distribute this SOFTWARE. The public may copy, distribute,
+ # prepare derivative works and publicly display this SOFTWARE without
+ # charge, provided that this Notice and any statement of authorship are
+ # reproduced on all copies. Neither the Government nor the University
+ # makes any warranty, express or implied, or assumes any liability or
+ # responsibility for the use of this SOFTWARE.
+ #
+ # If SOFTWARE is modified to produce derivative works, such modified
+ # SOFTWARE should be clearly marked, so as not to confuse it with the
+ # version available from LANL.
+ #
+ # For more information about POOMA, send e-mail to pooma at acl.lanl.gov,
+ # or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
+ # ----------------------------------------------------------------------
+ # ACL:license
+
+ # Set ODIR, PROJECT_INCLUDES, UNIQUE
+ include $(SHARED_ROOT)/include2.mk
+
+ # Object file list.
+ # This list is user-editable.
+ # Be sure that $(UNIQUE)_OBJS is set, even if set to empty.
+
+ $(UNIQUE)_OBJS := \
+ $(ODIR)/DiskLayout.cmpl.o
+
+ LOCAL_OBJS += $($(UNIQUE)_OBJS)
+
+ # Set rules for the ODIR directory
+ include $(SHARED_ROOT)/compilerules.mk
+
+ # ACL:rcsinfo
+ # ----------------------------------------------------------------------
+ # $RCSfile: objfile.mk,v $ $Author: oldham $
+ # $Revision: 1.1 $ $Date: 2001/08/30 01:15:07 $
+ # ----------------------------------------------------------------------
+ # ACL:rcsinfo
Index: IO/tests/include.mk
===================================================================
RCS file: include.mk
diff -N include.mk
*** /dev/null Tue May 5 14:32:27 1998
--- include.mk Fri Sep 14 16:05:59 2001
***************
*** 0 ****
--- 1,59 ----
+ # Generated by mm.pl: Mon Mar 9 13:58:39 MST 1998
+ # ACL:license
+ # ----------------------------------------------------------------------
+ # This software and ancillary information (herein called "SOFTWARE")
+ # called POOMA (Parallel Object-Oriented Methods and Applications) is
+ # made available under the terms described here. The SOFTWARE has been
+ # approved for release with associated LA-CC Number LA-CC-98-65.
+ #
+ # Unless otherwise indicated, this SOFTWARE has been authored by an
+ # employee or employees of the University of California, operator of the
+ # Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
+ # the U.S. Department of Energy. The U.S. Government has rights to use,
+ # reproduce, and distribute this SOFTWARE. The public may copy, distribute,
+ # prepare derivative works and publicly display this SOFTWARE without
+ # charge, provided that this Notice and any statement of authorship are
+ # reproduced on all copies. Neither the Government nor the University
+ # makes any warranty, express or implied, or assumes any liability or
+ # responsibility for the use of this SOFTWARE.
+ #
+ # If SOFTWARE is modified to produce derivative works, such modified
+ # SOFTWARE should be clearly marked, so as not to confuse it with the
+ # version available from LANL.
+ #
+ # For more information about POOMA, send e-mail to pooma at acl.lanl.gov,
+ # or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
+ # ----------------------------------------------------------------------
+ # ACL:license
+
+
+ # Wrap make components from SHARED_ROOT and the current directory in the
+ # proper order so that variables like ODIR have the correct directory-specific
+ # value at the right moment. See the included files for details of what they
+ # are doing. This file should NOT be manually edited.
+
+ # Set NEXTDIR, THISDIR and DIR_LIST
+ include $(SHARED_ROOT)/include1.mk
+
+ # Include list of subdirectories to process
+ -include $(THISDIR)/subdir.mk
+
+ # Set ODIR, PROJECT_INCLUDES, UNIQUE
+ include $(SHARED_ROOT)/include2.mk
+
+ # Set list of object files, relative to ODIR
+ -include $(THISDIR)/objfile.mk
+
+ # Set rules for the ODIR directory
+ include $(SHARED_ROOT)/compilerules.mk
+
+ # Remove current dir from DIR_LIST
+ DIR_LIST :=$(filter-out $(firstword $(DIR_LIST)), $(DIR_LIST))
+
+
+ # ACL:rcsinfo
+ # ----------------------------------------------------------------------
+ # $RCSfile: include.mk,v $ $Author: oldham $
+ # $Revision: 1.3 $ $Date: 2001/08/30 01:15:19 $
+ # ----------------------------------------------------------------------
+ # ACL:rcsinfo
Index: IO/tests/makefile
===================================================================
RCS file: makefile
diff -N makefile
*** /dev/null Tue May 5 14:32:27 1998
--- makefile Fri Sep 14 16:05:59 2001
***************
*** 0 ****
--- 1,74 ----
+ # Generated by mm.pl: Mon Mar 9 13:58:39 MST 1998
+ # ACL:license
+ # ----------------------------------------------------------------------
+ # This software and ancillary information (herein called "SOFTWARE")
+ # called POOMA (Parallel Object-Oriented Methods and Applications) is
+ # made available under the terms described here. The SOFTWARE has been
+ # approved for release with associated LA-CC Number LA-CC-98-65.
+ #
+ # Unless otherwise indicated, this SOFTWARE has been authored by an
+ # employee or employees of the University of California, operator of the
+ # Los Alamos National Laboratory under Contract No. W-7405-ENG-36 with
+ # the U.S. Department of Energy. The U.S. Government has rights to use,
+ # reproduce, and distribute this SOFTWARE. The public may copy, distribute,
+ # prepare derivative works and publicly display this SOFTWARE without
+ # charge, provided that this Notice and any statement of authorship are
+ # reproduced on all copies. Neither the Government nor the University
+ # makes any warranty, express or implied, or assumes any liability or
+ # responsibility for the use of this SOFTWARE.
+ #
+ # If SOFTWARE is modified to produce derivative works, such modified
+ # SOFTWARE should be clearly marked, so as not to confuse it with the
+ # version available from LANL.
+ #
+ # For more information about POOMA, send e-mail to pooma at acl.lanl.gov,
+ # or visit the POOMA web page at http://www.acl.lanl.gov/pooma/.
+ # ----------------------------------------------------------------------
+ # ACL:license
+
+ # This file is user-editable
+
+ PROJECT_ROOT = $(shell cd ../../..; pwd)
+ include $(PROJECT_ROOT)/config/head.mk
+
+ PASS=APP
+
+ TSTOPTS =
+
+ ###########################
+
+ default:: tests
+
+ run: run_tests
+ cat *.out
+
+ run_tests: tests
+ $(ODIR)/DiskLayoutTest1 $(TSTOPTS) 1>DiskLayoutTest1.out 2>&1
+ $(ODIR)/FileSetWriter $(TSTOPTS) 1>FileSetWriter.out 2>&1
+
+ tests:: $(ODIR)/DiskLayoutTest1 $(ODIR)/FileSetWriter
+
+ ###########################
+
+ .PHONY: DiskLayoutTest1
+
+ DiskLayoutTest1: $(ODIR)/DiskLayoutTest1
+
+ $(ODIR)/DiskLayoutTest1: $(ODIR)/DiskLayoutTest1.o
+ $(LinkToSuite)
+
+ .PHONY: FileSetWriter
+
+ FileSetWriter: $(ODIR)/FileSetWriter
+
+ $(ODIR)/FileSetWriter: $(ODIR)/FileSetWriter.o
+ $(LinkToSuite)
+
+ include $(SHARED_ROOT)/tail.mk
+
+ # ACL:rcsinfo
+ # ----------------------------------------------------------------------
+ # $RCSfile: makefile,v $ $Author: oldham $
+ # $Revision: 1.22 $ $Date: 2001/08/30 01:15:19 $
+ # ----------------------------------------------------------------------
+ # ACL:rcsinfo
More information about the pooma-dev
mailing list