User Tools

Site Tools


download

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
download [2018/06/12 16:36]
krack Release 6.1
download [2018/12/10 13:41] (current)
tmueller update instructions for new CP2K-with-DBCSR-submodule
Line 6: Line 6:
 [[http://​www.gnu.org/​licenses/​gpl.html#​TOC1| the GPL license]]. [[http://​www.gnu.org/​licenses/​gpl.html#​TOC1| the GPL license]].
  
-Installation instructions can be found [[howto:​compile | on the wiki]] and in the INSTALL file which is part of the download.+Installation instructions can be found [[howto:​compile | on the wiki]] and in the ''​INSTALL.md'' ​file which is part of the download.
  
-The sparse matrix library DBCSR is part of CP2K,  +The sparse matrix library DBCSR is part of CP2K, and made available standalone at [[dbcsr | the DBCSR page]].
-and made available standalone at [[dbcsr | the DBCSR page]].+
  
 ===== Available versions of CP2K ===== ===== Available versions of CP2K =====
Line 18: Line 17:
   * All new features   * All new features
   * Potentially unstable / buggy   * Potentially unstable / buggy
-  * only available via SVN or git, known as '​trunk'​+  * only available via Git
 </​WRAP>​ | <​WRAP>​ </​WRAP>​ | <​WRAP>​
   * Older   * Older
Line 32: Line 31:
 ==== From an official release ==== ==== From an official release ====
  
-Sources of released versions are available at our [[http://sourceforge.net/projects/cp2k/files/ |sourceforge ​project page]]. Alternatively, ​[[http://​sourceforge.net/​projects/​cp2k/​files/​precompiled|precompiled]] ​single node, optimised CP2K versions for Linux with or without OpenMP support are available as well.+Sources of released versions are available at our [[https://github.com/cp2k/cp2k/releases/ |GitHub ​project page]]. Alternatively,​ precompiled single node, optimised CP2K versions for Linux with or without OpenMP support are available as well. 
 ==== From a Distribution ==== ==== From a Distribution ====
 +
 [[https://​packages.debian.org/​search?​keywords=cp2k|{{debian_logo.png?​100}}]] [[https://​packages.debian.org/​search?​keywords=cp2k|{{debian_logo.png?​100}}]]
 [[https://​apps.fedoraproject.org/​packages/​cp2k|{{fedora_logo.png?​150}}]] [[https://​apps.fedoraproject.org/​packages/​cp2k|{{fedora_logo.png?​150}}]]
Line 43: Line 44:
  
 ==== From a third party ==== ==== From a third party ====
 +
   * Debian/​Ubuntu alternative:​ http://​packages.mccode.org/​   * Debian/​Ubuntu alternative:​ http://​packages.mccode.org/​
   * Windows: https://​github.com/​brhr-iwao/​CP2K_for_Windows   * Windows: https://​github.com/​brhr-iwao/​CP2K_for_Windows
  
-==== Anonymous SVN Access ====+==== Git Access ==== 
 <note warning> <note warning>
-The code in SVN is under constant development. Check the [[http://​dashboard.cp2k.org| Dashboard]] for current issues. ​+The code in Git is under constant development. Check the [[http://​dashboard.cp2k.org| Dashboard]] for current issues. ​
 </​note>​ </​note>​
  
-The latest and all prior versions are available from the [[https://sourceforge.net/​projects/​cp2k/|CP2K SVN repository]]. +The [[https://git-scm.com/|Git]] (''​git''​) program must be installed on your machine for this to work.
  
-Check out only a needed branch (the branch will then be in cp2k/​cp2k). ​+=== Initial checkout ===
  
-  * current trunk: <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​trunk cp2k</​code>​ +The latest and all prior versions are available from the [[https://github.com/cp2k/cp2k/|CP2K GitHub repository]].  
-  * the cp2k-6_1-branch:​ <​code>​svn checkout http://svn.code.sf.net/​p/cp2k/code/​branches/​cp2k-6_1-branch ​cp2k</code> + 
-  * the cp2k-5_1-branch:​ <​code>​svn checkout http://svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-5_1-branch cp2k</​code>​ +To clone the current master:
-  * the cp2k-4_1-branch:​ <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-4_1-branch cp2k</​code>​ +
-  ​* ​the cp2k-3_0-branch<​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-3_0-branch cp2k</​code>​ +
-  * the cp2k-2_6-branch:​ <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-2_6-branch cp2k</​code>​ +
-  * the cp2k-2_5-branch:​ <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-2_5-branch cp2k</​code>​ +
-  * the cp2k-2_4-branch:​ <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-2_4-branch cp2k</​code>​ +
-  * the cp2k-2_3-branch:​ <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-2_3-branch cp2k</​code>​ +
-  * the cp2k-2_2-branch:​ <​code>​svn checkout http://​svn.code.sf.net/​p/​cp2k/​code/​branches/​cp2k-2_2-branch cp2k</​code>​+
  
-These branches can be updated to their latest version in the following way: 
 <​code>​ <​code>​
-cd cp2k/cp2k +git clone --recursive https://​github.com/​cp2k/cp2k.git cp2k
-svn update+
 </​code>​ </​code>​
  
-Alternatively,​ you may restrict the download ​to the folder ​cp2k/​cp2k ​containing source code, tools, and test inputs, e.g. for the trunk version use+or to directly checkout a branch (check ​the [[https://​github.com/​cp2k/cp2k/|CP2K GitHub project page]] ​for available branches):​ 
 <​code>​ <​code>​
-svn checkout http://svn.code.sf.net/​p/cp2k/code/trunk/cp2k cp2k+git clone --recursive -b support/​v6.1 https://github.com/cp2k/cp2k.git cp2k
 </​code>​ </​code>​
-Analogous checkouts work for the branch versions. 
  
-The [[http://​subversion.apache.org/​|Subversion]] (svn) program must be installed +=== Keeping ​your clone up-to-date (Git >= 2.14) ===
-on your machine for this to work.+
  
-==== GitHub Mirror ====+Set the following once on your CP2K Git clone. It will tell Git to automatically update included submodules as well and to always use rebase instead of merge.
  
-CP2K's official SVN repository is [[https://​github.com/​cp2k/​cp2k|mirrored at GitHub]]The mirror is automatically synced with SVN every 5 minutes.+<​code>​ 
 +cd cp2k 
 +git config submodule.recurse true 
 +git config pull.rebase true 
 +</​code>​
  
-If you have [[http://​git-scm.com/​|Git]] (command ''​git''​) installedyou can clone the CP2K GitHub repository ​with+After setting this optionupdate ​with the following:
  
 <​code>​ <​code>​
-git clone https://​github.com/​cp2k/​cp2k.git+cd cp2k 
 +git pull
 </​code>​ </​code>​
  
-Afterwards, ​to update to latest version ​(pull new commits)+If you want to set the options globally ​(valid for all Git commands on your machine), you can use the ''​%%--%%global''​ parameter for ''​git config'':​ 
 + 
 +<​code>​ 
 +git config --global submodule.recurse true 
 +git config --global ​pull.rebase true 
 +</​code>​ 
 + 
 +=== Keeping your clone up-to-date (Git < 2.14=== 
 + 
 +Set the following once on your CP2K Git clone. It will tell Git to always use rebase instead of merge.
  
 <​code>​ <​code>​
 cd cp2k cd cp2k
-git pull+git config ​pull.rebase true
 </​code>​ </​code>​
  
-This is a read-only copyso pull requests are not accepted via GitHub. See [[dev|information for developers]] on how to contribute patches.+After setting this optionupdate with the following:
  
 +<​code>​
 +cd cp2k
 +
 +git pull
 +git submodule update --recursive
 +</​code>​
download.1528814207.txt.gz · Last modified: 2018/06/12 16:36 by krack