Skip to content
This repository was archived by the owner on Jan 3, 2023. It is now read-only.

Commit 5ec9e25

Browse files
DawnStoneDawnStone
authored
modified references for ngraph repo rename - part 2 (#636)
* modified references for ngraph repo rename - part 2 * updated the ngraph repo name reference in the INSTALL readme file
1 parent 3ea55bb commit 5ec9e25

File tree

7 files changed

+53
-53
lines changed

7 files changed

+53
-53
lines changed

‎INSTALL‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ General Instructions
3636
These instructions assume that your system has been prepared in accordance
3737
with the above prerequisites.
3838

39-
$ cd ngraph-cpp
39+
$ cd ngraph
4040
$ mkdir build
4141
$ cd build
4242
$ cmake .. \

‎contrib/docker/Dockerfile.ngraph_cpp‎ renamed to ‎contrib/docker/Dockerfile.ngraph‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Environment to build and unit-test ngraph-cpp
1+
# Environment to build and unit-test ngraph
22

33
FROM ubuntu:16.04
44

‎contrib/docker/Dockerfile.ngraph_cpp.centos74_cmake3‎ renamed to ‎contrib/docker/Dockerfile.ngraph.centos74_cmake3‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Environment to build and unit-test ngraph-cpp on centos74
1+
# Environment to build and unit-test ngraph on centos74
22
# with gcc 4.8.5
33
# with python 2.7
44
# with cmake3

‎contrib/docker/Dockerfile.ngraph_cpp.ubuntu1604‎ renamed to ‎contrib/docker/Dockerfile.ngraph.ubuntu1604‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Environment to build and unit-test ngraph-cpp
1+
# Environment to build and unit-test ngraph
22

33
FROM ubuntu:16.04
44

‎contrib/docker/Dockerfile.ngraph_cpp.ubuntu1604_gcc48‎ renamed to ‎contrib/docker/Dockerfile.ngraph.ubuntu1604_gcc48‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Environment to build and unit-test ngraph-cpp
1+
# Environment to build and unit-test ngraph
22

33
FROM ubuntu:16.04
44

‎contrib/docker/Makefile‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ DIR = $(realpath ../..)
2525
# changed it must be done in other areas for the builds to work.
2626
DOCKUSER_HOME=/home/dockuser
2727

28-
# Use /home/dockuser/ngraph-cpp-test, because we run as the user (and not root)
29-
# /root/ngraph-cpp-test is not used, because /root is not accessible to user
30-
VOLUME = -v "${DIR}:${DOCKUSER_HOME}/ngraph-cpp-test"
28+
# Use /home/dockuser/ngraph-test, because we run as the user (and not root)
29+
# /root/ngraph-test is not used, because /root is not accessible to user
30+
VOLUME = -v "${DIR}:${DOCKUSER_HOME}/ngraph-test"
3131
GIT_COMMIT = $(shell git rev-parse HEAD)
3232
DBUILD_VERSION = ${GIT_COMMIT}_${PYTHON_VERSION}
3333
DBUILD_DIR = ${DIR}/contrib/docker/.build-${DBUILD_VERSION}
@@ -44,18 +44,18 @@ ifndef OS
4444
endif
4545

4646
ifeq ("$(shell echo ${OS} | grep centos)","centos74")
47-
RUN_AS_USER_SCRIPT=${DOCKUSER_HOME}/ngraph-cpp-test/contrib/docker/run_as_centos_user.sh
48-
DOCKERFILE=Dockerfile.ngraph_cpp.centos74_cmake3
47+
RUN_AS_USER_SCRIPT=${DOCKUSER_HOME}/ngraph-test/contrib/docker/run_as_centos_user.sh
48+
DOCKERFILE=Dockerfile.ngraph.centos74_cmake3
4949
else
50-
DOCKERFILE ?= "Dockerfile.ngraph_cpp"
51-
RUN_AS_USER_SCRIPT ?= ${DOCKUSER_HOME}/ngraph-cpp-test/contrib/docker/run_as_ubuntu_user.sh
50+
DOCKERFILE ?= "Dockerfile.ngraph"
51+
RUN_AS_USER_SCRIPT ?= ${DOCKUSER_HOME}/ngraph-test/contrib/docker/run_as_ubuntu_user.sh
5252
endif
5353

5454
# For gcc builds, we do NOT regard warnings as errors
5555
# For clang builds, we DO make warnings into errors
5656
CMAKE_OPTIONS_COMMON=-DNGRAPH_BUILD_DOXYGEN_DOCS=ON -DNGRAPH_BUILD_SPHINX_DOCS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo $(CMAKE_OPTIONS_EXTRA)
57-
CMAKE_OPTIONS_GCC=$(CMAKE_OPTIONS_COMMON) -DNGRAPH_INSTALL_PREFIX=${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-GCC/ngraph_dist
58-
CMAKE_OPTIONS_CLANG=$(MAKE_OPTIONS_COMMON)-DNGRAPH_INSTALL_PREFIX=${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG/ngraph_dist -DCMAKE_CXX_COMPILER=clang++-3.9 -DCMAKE_C_COMPILER=clang-3.9 -DNGRAPH_WARNINGS_AS_ERRORS=ON -DNGRAPH_USE_PREBUILT_LLVM=TRUE
57+
CMAKE_OPTIONS_GCC=$(CMAKE_OPTIONS_COMMON) -DNGRAPH_INSTALL_PREFIX=${DOCKUSER_HOME}/ngraph-test/BUILD-GCC/ngraph_dist
58+
CMAKE_OPTIONS_CLANG=$(MAKE_OPTIONS_COMMON)-DNGRAPH_INSTALL_PREFIX=${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG/ngraph_dist -DCMAKE_CXX_COMPILER=clang++-3.9 -DCMAKE_C_COMPILER=clang-3.9 -DNGRAPH_WARNINGS_AS_ERRORS=ON -DNGRAPH_USE_PREBUILT_LLVM=TRUE
5959

6060
CALLER_UID := $(shell id -u)
6161
CALLER_GID := $(shell id -g)
@@ -64,10 +64,10 @@ CALLER_GID := $(shell id -g)
6464
# line
6565
PYTHON_VERSION = 2
6666

67-
# Some targets are DEPRECATED and will be removed at a later date: check_cpu build_ngraph_cpp_cpu
67+
# Some targets are DEPRECATED and will be removed at a later date: check_cpu build_ngraph_cpu
6868
# These DEPRECATED targets are currently included for Jenkins job compatibility with older dev branches
6969
# Please see comments for individual targets for more details
70-
.PHONY: clean build_docker_image build_gcc check_gcc build_clang check_clang install_gcc install_clang shell check_cpu build_all build_ngraph_cpp_cpu
70+
.PHONY: clean build_docker_image build_gcc check_gcc build_clang check_clang install_gcc install_clang shell check_cpu build_all build_ngraph_cpu
7171

7272
DOCKER_BUILD=docker build --rm=true
7373

@@ -91,13 +91,13 @@ expand_dockerfile_templates:
9191
@echo "RUN_AS_USER_SCRIPT=${RUN_AS_USER_SCRIPT}"
9292
cd "${DIR}"/contrib/docker
9393
mkdir "${DBUILD_DIR}" || true
94-
sed -e 's/\(FROM ngraph.*\)/\1:${DBUILD_VERSION}/' ${DOCKERFILE} > "${DBUILD_DIR}"/Dockerfile.build_ngraph_cpp
94+
sed -e 's/\(FROM ngraph.*\)/\1:${DBUILD_VERSION}/' ${DOCKERFILE} > "${DBUILD_DIR}"/Dockerfile.build_ngraph
9595

9696
build_docker_image: expand_dockerfile_templates
97-
$(DOCKER_BUILD) -f="${DBUILD_DIR}"/Dockerfile.build_ngraph_cpp --build-arg python_version="${PYTHON_VERSION}" -t=build_ngraph_cpp:"${DBUILD_VERSION}" .
97+
$(DOCKER_BUILD) -f="${DBUILD_DIR}"/Dockerfile.build_ngraph --build-arg python_version="${PYTHON_VERSION}" -t=build_ngraph:"${DBUILD_VERSION}" .
9898
# remove the tag for the previous latest image
99-
docker rmi build_ngraph_cpp:latest || echo "keep going if docker rmi command fails"
100-
docker tag `docker images -q "build_ngraph_cpp:${DBUILD_VERSION}"` build_ngraph_cpp:latest
99+
docker rmi build_ngraph:latest || echo "keep going if docker rmi command fails"
100+
docker tag `docker images -q "build_ngraph:${DBUILD_VERSION}"` build_ngraph:latest
101101

102102
build_docker: build_docker_image
103103

@@ -110,8 +110,8 @@ sphinx_doc: build_docker_image
110110
${VOLUME} \
111111
{DOCKER_RUN_ENV} \
112112
--env RUN_UID="$(shell id -u)" \
113-
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-cpp-test/doc/sphinx; env VERBOSE=1 make html 2>&1 | tee make_sphinx_html.log" \
114-
"build_ngraph_cpp:${DBUILD_VERSION}" \
113+
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-test/doc/sphinx; env VERBOSE=1 make html 2>&1 | tee make_sphinx_html.log" \
114+
"build_ngraph:${DBUILD_VERSION}" \
115115
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
116116

117117
# Build
@@ -126,10 +126,10 @@ build_gcc: build_docker_image
126126
docker run --rm --tty \
127127
${VOLUME} \
128128
${DOCKER_RUN_ENV} \
129-
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-GCC/unit-test-results.xml" \
129+
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-test/BUILD-GCC/unit-test-results.xml" \
130130
--env RUN_UID="$(shell id -u)" \
131-
--env RUN_CMD="set -x; set -e ; set -o pipefail ; if [ -f "/etc/centos-release" ]; then cat /etc/centos-release; fi; if [ -f "/etc/lsb-release" ]; then cat /etc/lsb-release; fi; uname -a ; cat /etc/os-release || true; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-GCC; cmake ${CMAKE_OPTIONS_GCC} .. 2>&1 | tee cmake_gcc.log ; env VERBOSE=1 make ${PARALLEL} 2>&1 | tee make_gcc.log" \
132-
"build_ngraph_cpp:${DBUILD_VERSION}" \
131+
--env RUN_CMD="set -x; set -e ; set -o pipefail ; if [ -f "/etc/centos-release" ]; then cat /etc/centos-release; fi; if [ -f "/etc/lsb-release" ]; then cat /etc/lsb-release; fi; uname -a ; cat /etc/os-release || true; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-GCC; cmake ${CMAKE_OPTIONS_GCC} .. 2>&1 | tee cmake_gcc.log ; env VERBOSE=1 make ${PARALLEL} 2>&1 | tee make_gcc.log" \
132+
"build_ngraph:${DBUILD_VERSION}" \
133133
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
134134

135135
build_clang: build_docker_image
@@ -141,10 +141,10 @@ build_clang: build_docker_image
141141
docker run --rm --tty \
142142
${VOLUME} \
143143
${DOCKER_RUN_ENV} \
144-
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG/unit-test-results.xml" \
144+
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG/unit-test-results.xml" \
145145
--env RUN_UID="$(shell id -u)" \
146-
--env RUN_CMD="set -e ; set -o pipefail ; if [ -f "/etc/centos-release" ]; then cat /etc/centos-release; fi; if [ -f "/etc/lsb-release" ]; then cat /etc/lsb-release; fi; uname -a ; cat /etc/os-release || true; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG; cmake ${CMAKE_OPTIONS_CLANG} .. 2>&1 | tee cmake_clang.log ; env VERBOSE=1 make ${PARALLEL} 2>&1 | tee make_clang.log" \
147-
"build_ngraph_cpp:${DBUILD_VERSION}" \
146+
--env RUN_CMD="set -e ; set -o pipefail ; if [ -f "/etc/centos-release" ]; then cat /etc/centos-release; fi; if [ -f "/etc/lsb-release" ]; then cat /etc/lsb-release; fi; uname -a ; cat /etc/os-release || true; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG; cmake ${CMAKE_OPTIONS_CLANG} .. 2>&1 | tee cmake_clang.log ; env VERBOSE=1 make ${PARALLEL} 2>&1 | tee make_clang.log" \
147+
"build_ngraph:${DBUILD_VERSION}" \
148148
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
149149

150150
# Check (run unit-tests)
@@ -155,30 +155,30 @@ check_gcc: build_gcc
155155
docker run --rm --tty \
156156
${VOLUME} \
157157
${DOCKER_RUN_ENV} \
158-
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-GCC/unit-test-results.xml" \
158+
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-test/BUILD-GCC/unit-test-results.xml" \
159159
--env RUN_UID="$(shell id -u)" \
160-
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-GCC; env VERBOSE=1 make unit-test-check 2>&1 | tee make_check_gcc.log ; sed -E -e 's/classname\=\"[a-zA-Z0-9_]+/&1_gcc/' unit-test-results.xml > unit-test-results-gcc.xml" \
161-
"build_ngraph_cpp:${DBUILD_VERSION}" \
160+
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-GCC; env VERBOSE=1 make unit-test-check 2>&1 | tee make_check_gcc.log ; sed -E -e 's/classname\=\"[a-zA-Z0-9_]+/&1_gcc/' unit-test-results.xml > unit-test-results-gcc.xml" \
161+
"build_ngraph:${DBUILD_VERSION}" \
162162
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
163163

164164
check_clang: build_clang
165165
docker run --rm --tty \
166166
${VOLUME} \
167167
${DOCKER_RUN_ENV} \
168-
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG/unit-test-results.xml" \
168+
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG/unit-test-results.xml" \
169169
--env RUN_UID="$(shell id -u)" \
170-
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG; env VERBOSE=1 make check 2>&1 | tee make_check_clang.log ; sed -E -e 's/classname\=\"[a-zA-Z0-9_]+/&1_clang/' unit-test-results.xml > unit-test-results-clang.xml" \
171-
"build_ngraph_cpp:${DBUILD_VERSION}" \
170+
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG; env VERBOSE=1 make check 2>&1 | tee make_check_clang.log ; sed -E -e 's/classname\=\"[a-zA-Z0-9_]+/&1_clang/' unit-test-results.xml > unit-test-results-clang.xml" \
171+
"build_ngraph:${DBUILD_VERSION}" \
172172
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
173173

174174
style_clang: build_clang
175175
docker run --rm --tty \
176176
${VOLUME} \
177177
${DOCKER_RUN_ENV} \
178-
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG/unit-test-results.xml" \
178+
--env GTEST_OUTPUT="xml:${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG/unit-test-results.xml" \
179179
--env RUN_UID="$(shell id -u)" \
180-
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG; env VERBOSE=1 make style-check 2>&1 | tee make_style_check_clang.log" \
181-
"build_ngraph_cpp:${DBUILD_VERSION}" \
180+
--env RUN_CMD="set -e ; set -o pipefail ; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG; env VERBOSE=1 make style-check 2>&1 | tee make_style_check_clang.log" \
181+
"build_ngraph:${DBUILD_VERSION}" \
182182
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
183183

184184
# Install
@@ -191,8 +191,8 @@ install_gcc: check_gcc
191191
${VOLUME} \
192192
${DOCKER_RUN_ENV} \
193193
--env RUN_UID="$(shell id -u)" \
194-
--env RUN_CMD="set -e ; set -o pipefail; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-GCC ; test -d ngraph_dist && rm -fr ngraph_dist && echo 'Removed old ngraph_dist directory' ; make install 2>&1 | tee make_install_gcc.log ; tar czf ngraph_dist_gcc.tgz ngraph_dist 2>&1 | tee make_tarball_gcc.log" \
195-
"build_ngraph_cpp:${DBUILD_VERSION}" \
194+
--env RUN_CMD="set -e ; set -o pipefail; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-GCC ; test -d ngraph_dist && rm -fr ngraph_dist && echo 'Removed old ngraph_dist directory' ; make install 2>&1 | tee make_install_gcc.log ; tar czf ngraph_dist_gcc.tgz ngraph_dist 2>&1 | tee make_tarball_gcc.log" \
195+
"build_ngraph:${DBUILD_VERSION}" \
196196
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
197197

198198
install_clang: check_clang
@@ -201,8 +201,8 @@ install_clang: check_clang
201201
${VOLUME} \
202202
${DOCKER_RUN_ENV} \
203203
--env RUN_UID="$(shell id -u)" \
204-
--env RUN_CMD="set -e ; set -o pipefail; cd ${DOCKUSER_HOME}/ngraph-cpp-test/BUILD-CLANG ; test -d ngraph_dist && rm -fr ngraph_dist && echo 'Removed old ngraph_dist directory' ; make install 2>&1 | tee make_install_clang.log ; tar czf ngraph_dist_clang.tgz ngraph_dist 2>&1 | tee make_tarball_clang.log" \
205-
"build_ngraph_cpp:${DBUILD_VERSION}" \
204+
--env RUN_CMD="set -e ; set -o pipefail; cd ${DOCKUSER_HOME}/ngraph-test/BUILD-CLANG ; test -d ngraph_dist && rm -fr ngraph_dist && echo 'Removed old ngraph_dist directory' ; make install 2>&1 | tee make_install_clang.log ; tar czf ngraph_dist_clang.tgz ngraph_dist 2>&1 | tee make_tarball_clang.log" \
205+
"build_ngraph:${DBUILD_VERSION}" \
206206
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
207207

208208
# Interactive shell
@@ -213,7 +213,7 @@ shell: build_docker_image
213213
${VOLUME} \
214214
${DOCKER_RUN_ENV} \
215215
--env RUN_UID="$(shell id -u)" \
216-
"build_ngraph_cpp:${DBUILD_VERSION}" \
216+
"build_ngraph:${DBUILD_VERSION}" \
217217
sh -c "cd ${DOCKUSER_HOME}; ${RUN_AS_USER_SCRIPT}"
218218

219219
# Clean
@@ -234,6 +234,6 @@ check_cpu: check_all
234234
echo 'WARNING: "make check_cpu" is DEPRECATED and will be removed in a future revision'
235235
echo ' "make check_cpu" runs "make check_all" now, building with all compilers (gcc and clang)'
236236

237-
build_ngraph_cpp_cpu: build_docker_image
238-
echo 'WARNING: "make build_ngraph_cpp_cpu" is DEPRECATED and will be removed in a future revision'
239-
echo ' "make build_ngraph_cpp_cpu" runs "make build_docker_image" now'
237+
build_ngraph_cpu: build_docker_image
238+
echo 'WARNING: "make build_ngraph_cpu" is DEPRECATED and will be removed in a future revision'
239+
echo ' "make build_ngraph_cpu" runs "make build_docker_image" now'

0 commit comments

Comments
 (0)