You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mnemonic.apache.org by ga...@apache.org on 2016/09/01 01:52:47 UTC
[1/2] incubator-mnemonic git commit: MNEMONIC-96: Verify the
functionalities on latest version of nvml
Repository: incubator-mnemonic
Updated Branches:
refs/heads/master bec526b8b -> c9f5f4673
MNEMONIC-96: Verify the functionalities on latest version of nvml
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/db57bf3f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/db57bf3f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/db57bf3f
Branch: refs/heads/master
Commit: db57bf3f3ca1354c8320a11f6817b99568a1117b
Parents: bec526b
Author: Yanhui Zhao <ya...@outlook.com>
Authored: Wed Aug 31 07:14:39 2016 +0000
Committer: Yanhui Zhao <ya...@outlook.com>
Committed: Wed Aug 31 23:58:19 2016 +0000
----------------------------------------------------------------------
README.md | 2 +-
docker/Dockerfile | 19 ++++++++++++++++---
docker/README.md | 11 ++++++-----
3 files changed, 23 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/db57bf3f/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a36f4d9..4175d4f 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,7 @@ Please see the file LICENSE for information on how this library is licensed.
To build this library, you may need to install some required packages on the build system:
* **Maven** -- the building tool v3.2.1 or above [Required]
-* **NVML** -- the NVM library (Please compile this library that is tagged with 0.1+b16) (http://pmem.io) [Optional if mnemonic-nvml-vmem-service is excluded, e.g. MacOSX]
+* **NVML** -- the NVM library (Please compile this library that is tagged with 1.1 release with pandoc dependency) (http://pmem.io) [Optional if mnemonic-nvml-vmem-service is excluded, e.g. MacOSX]
* **JDK** -- the Java Develop Kit 1.6 or above (please properly configure JAVA_HOME) [Required]
* **PMFS** -- the PMFS should be properly installed and configured on Linux system if you want to simulate read latency [Optional]
* **PMalloc** -- a supported durable memory native library at https://github.com/NonVolatileComputing/pmalloc.git [Optional if mnemonic-pmalloc-service is excluded]
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/db57bf3f/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index fdfbf41..657f51e 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -29,8 +29,11 @@ ENV proxy_port ""
RUN echo $proxy
+RUN curl -sSL https://s3.amazonaws.com/download.fpcomplete.com/centos/7/fpco.repo | tee /etc/yum.repos.d/fpco.repo
+
RUN yum -y update && yum -y groupinstall 'Development Tools' && \
- yum -y install java-devel cmake check check-devel libuuid-devel man && yum clean all
+ yum -y install java-devel cmake check check-devel libuuid-devel man zlib-devel wget stack && yum clean all
+
RUN curl -O http://apache.mirrors.ionfish.org/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz && \
tar xvf apache-maven-3.3.9-bin.tar.gz && \
mv apache-maven-3.3.9 /usr/local/apache-maven
@@ -41,11 +44,20 @@ ENV PATH $M2:$PATH
ENV JAVA_HOME /usr/lib/jvm/java
ENV PATH $JAVA_HOME/bin:$PATH
-RUN mkdir -p /ws && cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
+RUN mkdir -p /ws && cd /ws && wget https://hackage.haskell.org/package/pandoc-1.17.0.3/pandoc-1.17.0.3.tar.gz && \
+ tar xvzf pandoc-1.17.0.3.tar.gz && \
+ mv pandoc-1.17.0.3 pandoc && \
+ rm pandoc-1.17.0.3.tar.gz
+
+RUN cd /ws/pandoc && stack setup && stack install
+ENV PD_HOME /ws/pandoc/.stack-work/install/x86_64-linux/lts-5.8/7.10.3/bin
+ENV PATH $PD_HOME:$PATH
+
+RUN cd /ws && git clone https://github.com/NonVolatileComputing/pmalloc.git && \
cd pmalloc && mkdir build && cd build && cmake .. && make && make install
RUN cd /ws && git clone https://github.com/pmem/nvml.git && \
- cd nvml && git checkout tags/0.1+b16 && make && make install
+ cd nvml && git checkout tags/1.1 && make && make install
RUN echo export MAVEN_OPTS="\" $([[ \"x\" != \"x${proxy_host}\" ]] && echo -DproxySet=\\\"true\\\" -DproxyHost=${proxy_host} -DproxyPort=${proxy_port}) \"" \
> /etc/profile.d/mvn.sh && chmod +x /etc/profile.d/mvn.sh
@@ -54,3 +66,4 @@ RUN cd /ws && git clone https://github.com/apache/incubator-mnemonic.git && \
WORKDIR /ws
CMD ["bash"]
+
http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/blob/db57bf3f/docker/README.md
----------------------------------------------------------------------
diff --git a/docker/README.md b/docker/README.md
index 51ad381..b35c2b9 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -14,11 +14,12 @@ This is the "Dockerfile" that will automatically build the environment of this p
- 3. Install yum default "Development Tools".
- 4. Install maven.
- 5. Set up environment variables of paths.
-- 6. Create /ws folder and install pmalloc.
-- 7. Install nvml in /ws.
-- 8. Set up maven proxy mvn.sh.
-- 9. Clone mnemonic code then build/install.
-- 10. Go to /ws fold and start bash.
+- 6. Create /ws folder and install nvml dependency pandoc in /ws/pandoc.
+- 7. Install pmalloc in /ws
+- 8. Install nvml in /ws.
+- 9. Set up maven proxy mvn.sh.
+- 10. Clone mnemonic code then build/install.
+- 11. Go to /ws fold and start bash.
#### How to set up proxy?
[2/2] incubator-mnemonic git commit: Merge pull request #12 from
yzz127/master
Posted by ga...@apache.org.
Merge pull request #12 from yzz127/master
MNEMONIC-96: Verify the functionalities on latest version of nvml
Project: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/commit/c9f5f467
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/tree/c9f5f467
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mnemonic/diff/c9f5f467
Branch: refs/heads/master
Commit: c9f5f4673ac7e2bca813659b1c55d41c77f147c4
Parents: bec526b db57bf3
Author: Wang, Gang <qi...@gmail.com>
Authored: Wed Aug 31 18:50:47 2016 -0700
Committer: GitHub <no...@github.com>
Committed: Wed Aug 31 18:50:47 2016 -0700
----------------------------------------------------------------------
README.md | 2 +-
docker/Dockerfile | 19 ++++++++++++++++---
docker/README.md | 11 ++++++-----
3 files changed, 23 insertions(+), 9 deletions(-)
----------------------------------------------------------------------