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

Eliminating 'failure' message generated by calling 'svn info' #11

Merged
merged 1 commit into from
Sep 13, 2014

Conversation

worleyph
Copy link
Contributor

'git describe' and 'svn info' are both called in the logic that archives provenance
for the code with performance data, to provide something that will work both with
ACME and with non-ACME versions of CESM. This generates 'failed' messages
depending on whether this is a git or a subversion repository.

Logic is added to test whether .git or .svn exist at the repository root before calling
git or svn commands, respectively. (This appears to be a standard approach.)

(bit-for-bit - does not touch source code or compiler options)

…not a subversion repository

'git describe' and 'svn info' are both called in the logic that archives provenance
for the code with performance data, to provide something that will work both with
ACME and with non-ACME versions of CESM. This generates 'failed' messages depending on
whether this is a git or a subversion repository.

Logic is added to test whether .git or .svn exist at the repository root before calling
git or svn commands, respectively. (This appears to be a standard approach.)
@douglasjacobsen douglasjacobsen merged commit e945e90 into master Sep 13, 2014
@douglasjacobsen douglasjacobsen deleted the worleyph/scripts/git-and-svn-test-fix branch September 13, 2014 13:18
douglasjacobsen pushed a commit that referenced this pull request Aug 27, 2015
bdf9703 change 2 occurrences of return(0) to return(MPI_SUCCESS) (MPI_SUCCESS is currently 0 so no functional change)
3a61862 Merge pull request #11 from jedwards4b/master
c168dc0 add a MPI_Info_free to mpi-serial
964c454 add mpi_in_place to mpi_allreduce, add return code to mpi_info_create
f538fd5 added MPI_IN_PLACE support to collectives
d5f9d41 add definition of MPI_IN_PLACE (still need use)
9a4b2a1 copy fortran mpi type values into mpi.h
91a847b fix caps in MPI_Info_create
bb039e2 Fix typo MPI_Type_indexed_block -> MPI_Type_create_indexed_block
62bba46 added MPI_Alltoallw
dc6b40f added fortran support for LONG_LONG and UNSIGNED_LONG_LONG, added MPI_OFFSET to go along with MPI_Offset
854abfd added MPI_Info, MPI_Info_create, MPI_Info_set
fea87c9 added MPI_LONG_LONG, MPI_LONG_LONG_INT, and MPI_UNSIGNED_LONG_LONG
bc08ad2 Add output files and scripts to .gitignore
4fbc980 Merge branch 'mpi_free_fix' (PR #4)
ff61f8a Add .gitignore to testunit directory
741dca5 Merge branch 'NAG_6.0_port'
2e144ab Add .gitignore to mpi-serial/tests
5e9d955 Re-generate mpi-serial/configure
380e2d3 Define MYF90FLAGS and remove ctest2 and ftest2
58e276e Test for NAG compiler and add the -mismatch flag
05b0b62 Use selected_int_kind(13) to get an 8-byte integer
ea56905 Fix PGI testing with mpi-serial
ff704ff Fix MPI-related MCTWorld issues discovered by valgrind.
599c2cc Make m_SparseMatrixPlus strategy error fatal.
a3bbe88 Issue #3 Add LIBS to mpi-serial test build
652b112 Make top level configure also config mpi-serial
04ed959 Remove .svn directories from mpi-serial
9b13da7 remove mpif.h from .gitignore
9962f34 add missing mpif.h
439f02e V2.0 !!!  check in changes for MPI types and MPI_STATUS_IGNORE.
1823df3 V2.0 !!!  check in changes for MPI types and MPI_STATUS_IGNORE.

git-subtree-dir: externals/mct
git-subtree-split: bdf9703
douglasjacobsen pushed a commit that referenced this pull request Aug 27, 2015
rljacob added a commit that referenced this pull request Aug 27, 2015
Update ESMCI/cime master to cime 1.1.12 from CESM-development/master
rljacob added a commit that referenced this pull request Aug 27, 2015
Some changes are needed to cime for it work with ACME.

This branch was prepared using subtree split from within ACME while preparing, but before finishing,
the rljacob/cime-merge branch.. The individual commit messages on this branch describe changes
made for ACME that were not included in this branch.

ACME-specific:
Remove references to cvmix in Makefile.
Remove the -no-opt-dynamic-align option from intel.
Add +mkl to intel and to blues.

Other cime updates:
POP2 is now POP
Update code in preview_namelist.
Use CIME version of Decomp.pm. We had pre-cime version.
@jgfouca jgfouca mentioned this pull request Oct 23, 2015
@jonbob jonbob mentioned this pull request Dec 15, 2016
rljacob pushed a commit that referenced this pull request Apr 25, 2017
add mpi_in_place to mpi_allreduce, add return code to mpi_info_create
rabramoff referenced this pull request in rabramoff/ACME Dec 19, 2017
rljacob added a commit that referenced this pull request Apr 16, 2021
    Update ACMEs cime to cime 2.0.12

    conflicts resolved: use our version of config_compsets.xml

    Needed or useful for ACME:
    BatchMaker.pm:  more robust mpirun selection, don't ignore -project, CESM-Development/cime#140
    Update pio2 cmake build CESM-Development/cime#137
    cime unit tests now work when dot is not in path CESM-Development/cime#141
    update summarize_cprn_diffs to work with new scripts CESM-Development/cime#131
    Change cesm_setup to get list of models from env_run CESM-Development/cime#133
    Fix uninitialized value bug in create_test
    Various build fixes CESM-Development/cime#120
    Move lnd <-> glc coupling into coupler CESM-Development/cime#106
    Update batch configuration for edison
    Fix finding component history files for baseline gen,comp  CESM-Development/cime#86
    Change shr_flux_mods to support CAM aquaplanet CESM-Development/cime#64
    Improve cesm_clean and add compiler options helpful for pop/cice CESM-Development/cime#63 and 88
    Fix Batch* to allow machines that don't allow direct queue submissions and output the qsub command.
    configure uses -cimeroot even with -list CESM-Development/cime#55
    Have preview_namelists load modules for chemistry preprocessor.
    Fix minor compiler complaints for NAG.
    Add environment variable CIME_MODULES_LOADED to prevent module evnironment being loaded more than once
    Update dirunal shr_flux code and diurnal ocean feature in docn.  Don't hardwire 30 minute coupling period.

    No impact (yet) on ACME:
    Workaround for bug in cism-test_coupling cases.  CESM-Development/cime#138
    Increase compatability with pio2 build system.  CESM-Development/cime#137
    Use more general location for pfUnit CESM-Development/cime#134
    Replace large array in shr_expr_parser_mod CESM-Development/cime#130
    Fix (unused) dynamic_vector allocation CESM-Development/cime#125
    Add -qfloat=nomaf for mira/cetus
    Update hobart and edison/cray compiles.
    Read in namelists for new modules on task 0 only CESM-Development/cime#123
    Add cray compiler on edison CESM-Development/cime#120
    Fix mpi_unit_tests on yellowstone CESM-Development/cime#87
    Update hobart pelayouts CESM-Development/cime#62
    Allow fire emission fluxes CESM-Development/cime#61
    Update ExpectedTestFails.xml
    Fix hobart path for cprnc
rljacob added a commit that referenced this pull request May 6, 2021
Update ESMCI/cime master to cime 1.1.12 from CESM-development/master
rljacob added a commit that referenced this pull request May 6, 2021
    Update ACMEs cime to cime 2.0.12

    conflicts resolved: use our version of config_compsets.xml

    Needed or useful for ACME:
    BatchMaker.pm:  more robust mpirun selection, don't ignore -project, CESM-Development/cime#140
    Update pio2 cmake build CESM-Development/cime#137
    cime unit tests now work when dot is not in path CESM-Development/cime#141
    update summarize_cprn_diffs to work with new scripts CESM-Development/cime#131
    Change cesm_setup to get list of models from env_run CESM-Development/cime#133
    Fix uninitialized value bug in create_test
    Various build fixes CESM-Development/cime#120
    Move lnd <-> glc coupling into coupler CESM-Development/cime#106
    Update batch configuration for edison
    Fix finding component history files for baseline gen,comp  CESM-Development/cime#86
    Change shr_flux_mods to support CAM aquaplanet CESM-Development/cime#64
    Improve cesm_clean and add compiler options helpful for pop/cice CESM-Development/cime#63 and 88
    Fix Batch* to allow machines that don't allow direct queue submissions and output the qsub command.
    configure uses -cimeroot even with -list CESM-Development/cime#55
    Have preview_namelists load modules for chemistry preprocessor.
    Fix minor compiler complaints for NAG.
    Add environment variable CIME_MODULES_LOADED to prevent module evnironment being loaded more than once
    Update dirunal shr_flux code and diurnal ocean feature in docn.  Don't hardwire 30 minute coupling period.

    No impact (yet) on ACME:
    Workaround for bug in cism-test_coupling cases.  CESM-Development/cime#138
    Increase compatability with pio2 build system.  CESM-Development/cime#137
    Use more general location for pfUnit CESM-Development/cime#134
    Replace large array in shr_expr_parser_mod CESM-Development/cime#130
    Fix (unused) dynamic_vector allocation CESM-Development/cime#125
    Add -qfloat=nomaf for mira/cetus
    Update hobart and edison/cray compiles.
    Read in namelists for new modules on task 0 only CESM-Development/cime#123
    Add cray compiler on edison CESM-Development/cime#120
    Fix mpi_unit_tests on yellowstone CESM-Development/cime#87
    Update hobart pelayouts CESM-Development/cime#62
    Allow fire emission fluxes CESM-Development/cime#61
    Update ExpectedTestFails.xml
    Fix hobart path for cprnc
apcraig pushed a commit to apcraig/E3SM that referenced this pull request Mar 29, 2022
Update cime after blackbird/warhawk changes
jhollowed pushed a commit to jhollowed/E3SM that referenced this pull request Jul 3, 2022
This should fix the cldera-tools requirement (E3SM-Project#10). I verified that the
original two tests are not using cldera-tools and the new test is using
cldera-tools on mappy.

It should be easy to rebase this if we want to merge upstream master
first.
AllenHuAtmoSci pushed a commit to AllenHuAtmoSci/PerlmutterMAM5 that referenced this pull request Apr 24, 2023
njeffery pushed a commit that referenced this pull request Apr 28, 2023
AaronDonahue pushed a commit that referenced this pull request May 9, 2023
cee/15.0.0 with GPU MPI buffers can crash in a system lib like this:

#4  0x00007fffe159e35b in (anonymous namespace)::do_free_with_callback(void*, void (*)(void*)) [clone .constprop.0] () from /opt/cray/pe/cce/15.0.0/cce/x86_64/lib/libtcmalloc_minimal.so.1
#5  0x00007fffe15a8f16 in tc_free () from /opt/cray/pe/cce/15.0.0/cce/x86_64/lib/libtcmalloc_minimal.so.1
#6  0x00007fffe99c2bcd in _dlerror_run () from /lib64/libdl.so.2
#7  0x00007fffe99c2481 in dlopen@@GLIBC_2.2.5 () from /lib64/libdl.so.2
#8  0x00007fffea7bce42 in _ad_cray_lock_init () from /opt/cray/pe/lib64/libmpi_cray.so.12
#9  0x00007fffed7eb37a in call_init.part () from /lib64/ld-linux-x86-64.so.2
#10 0x00007fffed7eb496 in _dl_init () from /lib64/ld-linux-x86-64.so.2
#11 0x00007fffed7dc58a in _dl_start_user () from /lib64/ld-linux-x86-64.so.2
#12 0x0000000000000001 in ?? ()
#13 0x00007fffffff42e7 in ?? ()
#14 0x0000000000000000 in ?? ()

Work around this by using cee/14.0.3.
xylar pushed a commit to xylar/E3SM that referenced this pull request May 17, 2023
)

* Added design document for global reductions/collectives

  The design describes reproducible global sums and global min/max
  functionality.
philipwjones added a commit to philipwjones/E3SM that referenced this pull request May 31, 2023
)

* Added design document for global reductions/collectives

  The design describes reproducible global sums and global min/max
  functionality.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants