charm.git
9 years agoMerge branch 'charm' of charmgit:charm into charm
Gengbin Zheng [Mon, 6 Aug 2012 17:23:57 +0000 (12:23 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agoset last table entry type to 0
Gengbin Zheng [Mon, 6 Aug 2012 17:23:14 +0000 (12:23 -0500)]
set last table entry type to 0

9 years agoMerge branch 'charm' of charmgit:charm into charm
Abhinav Bhatele [Sat, 4 Aug 2012 01:12:19 +0000 (18:12 -0700)]
Merge branch 'charm' of charmgit:charm into charm

9 years agofixes to the 'install' target of Makefile
Abhinav Bhatele [Sat, 4 Aug 2012 01:10:25 +0000 (18:10 -0700)]
fixes to the 'install' target of Makefile

- On platforms like BG/P, lib_so is not present
- When doing an AMPI build, include/ might have sub-directories

9 years agofix a bug in previous commit
Gengbin Zheng [Sat, 4 Aug 2012 00:00:01 +0000 (19:00 -0500)]
fix a bug in previous commit

9 years agoupdated argc before calling MPI_Init in case argc and argv do not agree.
Gengbin Zheng [Fri, 3 Aug 2012 20:24:43 +0000 (15:24 -0500)]
updated argc before calling MPI_Init in case argc and argv do not agree.

9 years agore-generated
Gengbin Zheng [Fri, 3 Aug 2012 19:54:59 +0000 (14:54 -0500)]
re-generated

9 years agouse command xtprocadmin on cray XE to find max nid.
Gengbin Zheng [Fri, 3 Aug 2012 19:51:32 +0000 (14:51 -0500)]
use command xtprocadmin on cray XE to find max nid.

9 years agoFT Tests: Typo fix casual -> causal
Phil Miller [Thu, 2 Aug 2012 22:21:09 +0000 (17:21 -0500)]
FT Tests: Typo fix casual -> causal

9 years agoFT Tests: And, the missing top-level makefile
Phil Miller [Thu, 2 Aug 2012 22:14:19 +0000 (17:14 -0500)]
FT Tests: And, the missing top-level makefile

9 years agoFT Tests: adjust other makefiles to match sync/causal testing split
Phil Miller [Thu, 2 Aug 2012 22:08:44 +0000 (17:08 -0500)]
FT Tests: adjust other makefiles to match sync/causal testing split

9 years agoFT Tests: don't pass unsupported +fastRecovery under syncft
Phil Miller [Thu, 2 Aug 2012 21:51:44 +0000 (16:51 -0500)]
FT Tests: don't pass unsupported +fastRecovery under syncft

9 years agoModifying liveViz documentation to include changes in reduction implementation.
Esteban Meneses [Thu, 2 Aug 2012 19:40:19 +0000 (14:40 -0500)]
Modifying liveViz documentation to include changes in reduction implementation.

9 years agoMerge branch 'emenese2/liveVizBoundArray' into charm
Esteban Meneses [Thu, 2 Aug 2012 18:57:18 +0000 (13:57 -0500)]
Merge branch 'emenese2/liveVizBoundArray' into charm

9 years agoadd config_opts.sh to gitignore
Abhinav Bhatele [Thu, 2 Aug 2012 15:06:50 +0000 (08:06 -0700)]
add config_opts.sh to gitignore

9 years agolocation manager: for the global location update scheme, broadcast initial
Lukasz Wesolowski [Thu, 2 Aug 2012 05:39:09 +0000 (00:39 -0500)]
location manager: for the global location update scheme, broadcast initial
element assignment

9 years agoexamples/charm++: Always use CkWallTimer, not CmiWallTimer (tested)
Phil Miller [Tue, 31 Jul 2012 23:15:13 +0000 (18:15 -0500)]
examples/charm++: Always use CkWallTimer, not CmiWallTimer (tested)

9 years agoMerge branch 'charm' of charmgit:charm into charm
Yanhua Sun [Fri, 27 Jul 2012 19:47:03 +0000 (14:47 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agoexample add msgCount in all-to-all example
Yanhua Sun [Fri, 27 Jul 2012 19:46:26 +0000 (14:46 -0500)]
example add msgCount in all-to-all example

9 years agolbdb: Move C++-only function out of extern C to silence a Clang warning
Phil Miller [Fri, 27 Jul 2012 17:47:57 +0000 (12:47 -0500)]
lbdb: Move C++-only function out of extern C to silence a Clang warning

9 years agoBrace nested ifs to quiet Clang warnings about dangling else clauses
Phil Miller [Fri, 27 Jul 2012 17:22:32 +0000 (12:22 -0500)]
Brace nested ifs to quiet Clang warnings about dangling else clauses

9 years agocharmxi: Declare virtual destructor for abstract Type to silence warning from Clang
Phil Miller [Fri, 27 Jul 2012 17:18:10 +0000 (12:18 -0500)]
charmxi: Declare virtual destructor for abstract Type to silence warning from Clang

9 years agoadded many to many example to mimic PME 2D communication
YanhuaSun [Fri, 27 Jul 2012 04:48:45 +0000 (23:48 -0500)]
added many to many example to mimic PME 2D communication

9 years agoadded example of alltoall
YanhuaSun [Fri, 27 Jul 2012 04:18:54 +0000 (23:18 -0500)]
added example of alltoall

9 years agotests/charm++/jacobi3d-sdag: fixed Makefile to correctly
Lukasz Wesolowski [Thu, 26 Jul 2012 19:23:50 +0000 (14:23 -0500)]
tests/charm++/jacobi3d-sdag: fixed Makefile to correctly
compile with OpenMP support.

9 years agoexamples: modernize fib example and clean it up
Aaron Becker [Wed, 25 Jul 2012 17:26:23 +0000 (12:26 -0500)]
examples: modernize fib example and clean it up

9 years agocollision detection examples
Ehsan Totoni [Tue, 24 Jul 2012 22:48:54 +0000 (15:48 -0700)]
collision detection examples

9 years agoadded snipmate snippet for .ci files
Ralf Gunter [Mon, 23 Jul 2012 22:06:06 +0000 (17:06 -0500)]
added snipmate snippet for .ci files

9 years agoadjusted code examples for readability and consistancy
Joshua Ginsburg [Mon, 23 Jul 2012 16:44:37 +0000 (11:44 -0500)]
adjusted code examples for readability and consistancy

9 years agoMerge branch 'charm' into emenese2/liveVizBoundArray emenese2/liveVizBoundArray
Esteban Meneses [Mon, 23 Jul 2012 16:29:31 +0000 (11:29 -0500)]
Merge branch 'charm' into emenese2/liveVizBoundArray

9 years agofixed out of date refrence to prebuilt projections in charm source
Joshua Ginsburg [Mon, 23 Jul 2012 16:23:54 +0000 (11:23 -0500)]
fixed out of date refrence to prebuilt projections in charm source

9 years agoAdding an internal bound array to LiveViz. This would make it possible to have a...
Esteban Meneses [Mon, 23 Jul 2012 16:21:03 +0000 (11:21 -0500)]
Adding an internal bound array to LiveViz. This would make it possible to have a reduction running on the original array concurrently with LiveViz reduction. The init function in LiveViz was overloaded to add this functionality.

9 years agougly hack to fix line numbering with atomic
Ralf Gunter [Mon, 23 Jul 2012 09:49:32 +0000 (04:49 -0500)]
ugly hack to fix line numbering with atomic

9 years agoMerge branch 'charm' of git://charm.cs.uiuc.edu/charm into charm
Ralf Gunter [Mon, 23 Jul 2012 09:15:38 +0000 (04:15 -0500)]
Merge branch 'charm' of git://charm.cs.uiuc.edu/charm into charm

9 years agodemand creation test
Ehsan Totoni [Sat, 21 Jul 2012 04:43:43 +0000 (21:43 -0700)]
demand creation test

9 years agoadded caveats section to liveViz (reduction problems)
Ralf Gunter [Wed, 18 Jul 2012 16:37:57 +0000 (11:37 -0500)]
added caveats section to liveViz (reduction problems)

9 years agodocs: Add some explanation of SDAG constructs
Aaron Becker [Wed, 18 Jul 2012 15:53:46 +0000 (10:53 -0500)]
docs: Add some explanation of SDAG constructs

9 years agoAdded comment to checkpoint section of the manual.
Esteban Meneses [Wed, 18 Jul 2012 15:24:53 +0000 (10:24 -0500)]
Added comment to checkpoint section of the manual.

9 years agoCorrection in doc for Isomalloc - individual pupping is no longer supported
Nikhil Jain [Wed, 18 Jul 2012 04:44:43 +0000 (21:44 -0700)]
Correction in doc for Isomalloc - individual pupping is no longer supported

9 years agoremove duplication
sun [Wed, 18 Jul 2012 01:08:55 +0000 (20:08 -0500)]
remove duplication

9 years agoCharm++ manual intro: removed text about history of charm++
Lukasz Wesolowski [Tue, 17 Jul 2012 22:47:19 +0000 (17:47 -0500)]
Charm++ manual intro: removed text about history of charm++
from the opening paragraph - the separate section on history contains
the same information; moved link to papers from the beginning to later
on in the introduction

9 years agoCleaned up a footnote in AMPI manual.
Michael Robson [Tue, 17 Jul 2012 17:44:52 +0000 (12:44 -0500)]
Cleaned up a footnote in AMPI manual.

9 years agomsgQ test: feed printf the correct num args
Ramprasad Venkataraman [Mon, 16 Jul 2012 20:43:40 +0000 (15:43 -0500)]
msgQ test: feed printf the correct num args

9 years agobuild: check if anonymous structs and unions are permitted in configure
Ramprasad Venkataraman [Mon, 16 Jul 2012 16:17:20 +0000 (11:17 -0500)]
build: check if anonymous structs and unions are permitted in configure

9 years agoMerge branch 'charm' of charmgit:charm into charm
Gengbin Zheng [Wed, 11 Jul 2012 03:33:56 +0000 (22:33 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agoadd module file at beginning of PRE_LIBRARIES to resolve library dependence problem...
Gengbin Zheng [Wed, 11 Jul 2012 03:33:11 +0000 (22:33 -0500)]
add module file at beginning of PRE_LIBRARIES to resolve library dependence problem with AMPI_Main() if the ampi main is in a library.

9 years agoAdding more test cases with parallel recovery.
Esteban Meneses [Tue, 10 Jul 2012 15:53:43 +0000 (10:53 -0500)]
Adding more test cases with parallel recovery.

9 years agotests/charm++/jacobi3d-sdag: adding support for running with OpenMP
Lukasz Wesolowski [Mon, 9 Jul 2012 23:53:13 +0000 (18:53 -0500)]
tests/charm++/jacobi3d-sdag: adding support for running with OpenMP

9 years agoDocs: Mention reduction userFlag argument to contribute for matching result in SDAG
Phil Miller [Mon, 9 Jul 2012 17:12:27 +0000 (12:12 -0500)]
Docs: Mention reduction userFlag argument to contribute for matching result in SDAG

9 years agoInitializing number of emigrant recovering objects variable.
Esteban Meneses [Mon, 9 Jul 2012 14:21:09 +0000 (09:21 -0500)]
Initializing number of emigrant recovering objects variable.

9 years agotests/charm++/pingpong: run every test twice and only time the
Lukasz Wesolowski [Mon, 9 Jul 2012 04:41:42 +0000 (23:41 -0500)]
tests/charm++/pingpong: run every test twice and only time the
second run

9 years agofix in infi_CmiFree the case in standalone mode for SMP.
Gengbin Zheng [Sun, 8 Jul 2012 23:01:23 +0000 (18:01 -0500)]
fix in infi_CmiFree  the case in standalone mode for SMP.

9 years agoMerge branch 'charm' of charmgit:charm into charm
Yanhua Sun [Sun, 8 Jul 2012 18:41:39 +0000 (13:41 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agominor
Yanhua Sun [Sun, 8 Jul 2012 18:41:10 +0000 (13:41 -0500)]
minor

9 years agoFinally, a first version of parallel recovery with scalable collectives.
Esteban Meneses [Sat, 7 Jul 2012 23:26:53 +0000 (18:26 -0500)]
Finally, a first version of parallel recovery with scalable collectives.

9 years agoAdding support for emigrant objects at reduction manager.
Esteban Meneses [Sat, 7 Jul 2012 22:06:01 +0000 (17:06 -0500)]
Adding support for emigrant objects at reduction manager.

9 years agoMerge branch 'charm' of charmgit:charm into charm
Esteban Meneses [Sat, 7 Jul 2012 21:01:26 +0000 (16:01 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agoSending back recovering objects for parallel recovery.
Esteban Meneses [Sat, 7 Jul 2012 21:01:06 +0000 (16:01 -0500)]
Sending back recovering objects for parallel recovery.

9 years agotests/charm++/pingpong: (1) removed a memory leak in pipelined test
Lukasz Wesolowski [Sat, 7 Jul 2012 05:58:02 +0000 (00:58 -0500)]
tests/charm++/pingpong: (1) removed a memory leak in pipelined test
(2) modified the pipeline scheme w/ memcpy to include
the time for allocating a buffer on the receive side.

how memory allocations are done in the pipelined test so

9 years agouse CMK_IBV_PORT_ATTR_HAS_LINK_LAYER to protect use of link_layer field
Gengbin Zheng [Sat, 7 Jul 2012 05:40:52 +0000 (00:40 -0500)]
use CMK_IBV_PORT_ATTR_HAS_LINK_LAYER to protect use of link_layer field

9 years agoupdated
Gengbin Zheng [Sat, 7 Jul 2012 05:30:53 +0000 (00:30 -0500)]
updated

9 years agotest if ibverbs port_attr has link_layer field
Gengbin Zheng [Sat, 7 Jul 2012 05:29:44 +0000 (00:29 -0500)]
test if ibverbs port_attr has link_layer field

9 years agoChare Arrays: Add interface to signal online dynamic element insertion
Phil Miller [Fri, 6 Jul 2012 18:05:31 +0000 (18:05 +0000)]
Chare Arrays: Add interface to signal online dynamic element insertion

The AMR benchmark code was having trouble with hangs around
AtSync-triggered load balancing, apparently related to the fact that
it was inserting new chare array elements after startup. In
discussions with Gengbin, we figured that this arose because the
additional elements were interfering with the count of local elements
used to determine when a processor's objects had all reached AtSync
and thus it could contribute its LB stats.

The backend infrastructure had interfaces to 'pause' the LB barrier
while new elements were being inserted, but this had never been
surfaced in a way usable by client code. Add a `beginInserting()`
method as an analogue to the existing `doneInserting()` method that
was already required at startup to surface that code.

Tested to resolve at least one kind of hang in the AMR code on BG/Q.

9 years agotests/charm++/pingpong: for group pinpong, (1) added pipelined run
Lukasz Wesolowski [Thu, 5 Jul 2012 22:54:50 +0000 (17:54 -0500)]
tests/charm++/pingpong: for group pinpong, (1) added pipelined run
without allocation of fragment messages, (2) added warm up iteration
that does not get timed

9 years agoAdding support in central load balancer for restoring objects after parallel recovery.
Esteban Meneses [Thu, 5 Jul 2012 22:27:47 +0000 (17:27 -0500)]
Adding support in central load balancer for restoring objects after parallel recovery.

9 years agoMerge branch 'charm' of charmgit:charm into charm
Esteban Meneses [Thu, 5 Jul 2012 03:31:01 +0000 (22:31 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agoSolving bug in collective operations with parallel recovery.
Esteban Meneses [Thu, 5 Jul 2012 03:30:37 +0000 (22:30 -0500)]
Solving bug in collective operations with parallel recovery.

9 years agotests/charm++/pingpong: added pipelined test for groups
Lukasz Wesolowski [Thu, 5 Jul 2012 01:56:52 +0000 (20:56 -0500)]
tests/charm++/pingpong: added pipelined test for groups

9 years agoFixing the way to handle immigrant recovering objects.
Esteban Meneses [Wed, 4 Jul 2012 23:01:59 +0000 (18:01 -0500)]
Fixing the way to handle immigrant recovering objects.

9 years agoRemoving debug comments.
Esteban Meneses [Wed, 4 Jul 2012 19:24:03 +0000 (14:24 -0500)]
Removing debug comments.

9 years agoAdding support for bypassing message logging layer.
Esteban Meneses [Tue, 3 Jul 2012 16:04:20 +0000 (11:04 -0500)]
Adding support for bypassing message logging layer.

9 years agoModifying debug command.
Esteban Meneses [Mon, 2 Jul 2012 21:27:25 +0000 (16:27 -0500)]
Modifying debug command.

9 years agockhashtable: disambiguate non-dependent template member emenese2/liveVizFix
Ramprasad Venkataraman [Thu, 28 Jun 2012 18:35:23 +0000 (18:35 +0000)]
ckhashtable: disambiguate non-dependent template member

flagged as error by bgxlC -qlanglvl=extended0x

9 years agobuild: -optimize now defaults to -O2 instead of -O
Ramprasad Venkataraman [Thu, 28 Jun 2012 17:49:34 +0000 (17:49 +0000)]
build: -optimize now defaults to -O2 instead of -O

9 years agobuild: update compiler paths to latest on vesta
Ramprasad Venkataraman [Thu, 28 Jun 2012 17:48:17 +0000 (17:48 +0000)]
build: update compiler paths to latest on vesta

9 years agobuild: set flags to enable c11/cpp11 support on bgq/xlc
Ramprasad Venkataraman [Thu, 28 Jun 2012 17:29:55 +0000 (17:29 +0000)]
build: set flags to enable c11/cpp11 support on bgq/xlc

9 years agomsgQ test: Adjust test parameters (num priorities, numiters)
Ramprasad Venkataraman [Wed, 27 Jun 2012 16:12:09 +0000 (11:12 -0500)]
msgQ test: Adjust test parameters (num priorities, numiters)

9 years agomsgQ test: separate the unit tests for the STL variant from charm's default q tests
Ramprasad Venkataraman [Sat, 23 Jun 2012 07:15:59 +0000 (02:15 -0500)]
msgQ test: separate the unit tests for the STL variant from charm's default q tests

9 years agomsgQ test: implement enumerate() for STL msgq
Ramprasad Venkataraman [Thu, 28 Jun 2012 15:32:50 +0000 (10:32 -0500)]
msgQ test: implement enumerate() for STL msgq

9 years agomsgQ test: Add a correctness test for the stl q
Ramprasad Venkataraman [Thu, 21 Jun 2012 04:34:54 +0000 (23:34 -0500)]
msgQ test: Add a correctness test for the stl q

9 years agomsgQ test: Test performance along two axes...
Ramprasad Venkataraman [Wed, 20 Jun 2012 22:53:13 +0000 (17:53 -0500)]
msgQ test: Test performance along two axes...

number of different priority values
total number of items in container

9 years agomsgQ test: Use unordered_map (supported by C++11 std) if available
Ramprasad Venkataraman [Tue, 19 Jun 2012 16:53:26 +0000 (11:53 -0500)]
msgQ test: Use unordered_map (supported by C++11 std) if available

9 years agomsgQ test: Now also reports performance of STL-based variant of msg Q
Ramprasad Venkataraman [Mon, 18 Jun 2012 21:45:53 +0000 (16:45 -0500)]
msgQ test: Now also reports performance of STL-based variant of msg Q

Charm uses a custom message queue that handles arbitrary bitvector priorities.
Underneath, it implements three separate queues for -ve, +ve and zero priorities.

The test now includes a simple, STL-based implementation of similar functionality,
so that we can compare charm's msg q performance against a simple STL version.
Monitoring these numbers should help guide optimizations.

Capabilities of the reference STL msgQ
- Only integer / long / compile-time fixed length priorities are directly supported
- arbitrary bitvec prios can be supported using thin wrappers to the priority type
- std::less is assumed to be available for the priority type

The STL version is still quite naive and could use optimization, but is faster than
charm's custom implementation on g++ 4.4 on net-linux-x86_64.

9 years agomsgQ test: Modify to also measure charm's underlying msgQ's enq/deq performance
Ramprasad Venkataraman [Mon, 18 Jun 2012 18:29:37 +0000 (13:29 -0500)]
msgQ test: Modify to also measure charm's underlying msgQ's enq/deq performance

9 years agobuild/charmc: -use-new-std now tests and enables any compiler support for c11 / cpp11
Ramprasad Venkataraman [Wed, 27 Jun 2012 21:42:34 +0000 (16:42 -0500)]
build/charmc: -use-new-std now tests and enables any compiler support for c11 / cpp11

charmc has learnt a new flag: -use-new-std. This has to be passed on the build
command line where its picked up by configure. configure then tests for
compiler support for the appropriate flags.

This should allow building charm with c11/cpp11 support enabled. charmc from
such a build will also respect the same flag while building applications.

9 years agobuild: configure script now checks if unordered_map (C++11) is defined
Ramprasad Venkataraman [Tue, 19 Jun 2012 21:07:18 +0000 (16:07 -0500)]
build: configure script now checks if unordered_map (C++11) is defined

The compiler option is hardcoded for g++. However, this should not cause
any failures other than setting the corresponding macro to 0.

9 years agotests/charm++/pingpong : detect quiescence prior to running first benchmark
Lukasz Wesolowski [Tue, 26 Jun 2012 23:24:50 +0000 (18:24 -0500)]
tests/charm++/pingpong : detect quiescence prior to running first benchmark
to prevent misreporting its time (due to concurrent chare insertions
and initializations)

9 years agocharj: modify jacobi test to use reduction at termination
Aaron Becker [Sat, 23 Jun 2012 03:30:43 +0000 (22:30 -0500)]
charj: modify jacobi test to use reduction at termination

9 years agoNDMeshStreamer: replaced STAGED_COMPLETION macro with a variable
Lukasz Wesolowski [Sat, 23 Jun 2012 00:00:43 +0000 (19:00 -0500)]
NDMeshStreamer: replaced STAGED_COMPLETION macro with a variable

9 years agocharmc: disable preprocessing when generating .ci file dependencies
Phil Miller [Fri, 22 Jun 2012 23:44:39 +0000 (16:44 -0700)]
charmc: disable preprocessing when generating .ci file dependencies

I'm not sure this is actually a good thing to do, but it fixes severe
build breakage over the not-quite right disablement committed yesterday,

9 years agoNDMeshStreamer: periodic flushing can now be enabled or disabled using
Lukasz Wesolowski [Fri, 22 Jun 2012 21:02:22 +0000 (16:02 -0500)]
NDMeshStreamer: periodic flushing can now be enabled or disabled using
a parameter to the init and associateCallback functions

9 years agoMerge branch 'charm' of charmgit:charm into charm
YanhuaSun [Fri, 22 Jun 2012 19:51:26 +0000 (14:51 -0500)]
Merge branch 'charm' of charmgit:charm into charm

9 years agoadded Ping test for sending K msgs per node
YanhuaSun [Fri, 22 Jun 2012 19:51:18 +0000 (14:51 -0500)]
added Ping test for sending K msgs per node

9 years agocharj: added raw access option for jacobi benchmark
Aaron Becker [Fri, 22 Jun 2012 19:37:16 +0000 (14:37 -0500)]
charj: added raw access option for jacobi benchmark

9 years agocharj: get rid of extra malloc in jacobi implementation
Aaron Becker [Fri, 22 Jun 2012 16:27:18 +0000 (11:27 -0500)]
charj: get rid of extra malloc in jacobi implementation

9 years agocharj: pup functions and deallocation fix for array library
Aaron Becker [Fri, 22 Jun 2012 14:45:55 +0000 (09:45 -0500)]
charj: pup functions and deallocation fix for array library

9 years agocharj: jacobi app with charm equivalent
Aaron Becker [Fri, 22 Jun 2012 14:43:39 +0000 (09:43 -0500)]
charj: jacobi app with charm equivalent

9 years agocharj: don't try to move compiler output when we're just translating
Aaron Becker [Thu, 21 Jun 2012 23:23:29 +0000 (18:23 -0500)]
charj: don't try to move compiler output when we're just translating

9 years agoNDMeshStreamer: replaced flush to final destinations with a flush
Lukasz Wesolowski [Thu, 21 Jun 2012 23:14:17 +0000 (18:14 -0500)]
NDMeshStreamer: replaced flush to final destinations with a flush
along the dimension of the mesh when using completion detection;
removed code for flush to final destinations

9 years agoMerge branch 'charm' of charmgit:charm into charm
Aaron Becker [Thu, 21 Jun 2012 20:43:06 +0000 (15:43 -0500)]
Merge branch 'charm' of charmgit:charm into charm