Git: cleaning a branch before a PR, and merge back the clean history to the messy WIP branch

Sometimes, I have a branch with a new feature I work on, call it Feature_mess.

At some point I want to show this feature to colleagues, so I want to have a clean history, and remove some WIP stuff

To this end :

git checkout Feature_mess
git checkout -b Feature_clean
git rebase -i Feature_clean master (or whatever base you want)

Cleanup history here, remove crappy things, merge a lot of commits, rewrite history !
Now to benefit from this clean history as a base of Feature_mess

git branch temp Feature_mess
git checkout temp
git reset --soft Feature_clean

Now you are in the state of mess, with the history of cleanup, you can check diff and then

git commit

Et voilà !

More information on git reset here : https://gist.github.com/tnguyen14/0827ae6eefdff39e452b

Debian update to buster

# huge emoji in thunderbird titles, remove by adding a new font
apt install fonts-symbola
# save and cleanup app armor, old conf prevent from opening attachment files from thunderbird.
mv /etc/apparmor.d /etc/apparmor.d_backup
apt install --reinstall apparmor apparmor-profiles apparmor-profiles-extra
# TSC_DEADLINE errata warning, update micro code
apt install intel-microcode

Reboot (I do not find out why a systemctl restart apparmor do not work, reboot is fine)

Master internship : Color point cloud structure for picture color grading

We are looking for a highly motivated Master student for a research internship.

  • Keywords: Image manipulation, Color grading, Point clouds, Computer Graphics
  • Advisor: David Vanderhaeghe, Nicolas Mellado
  • Location: Laboratoire IRIT, STORM research team, Université Paul Sabatier – Toulouse
  • Duration: from February/March 2018, 5-7 months

The internship will take place in the IRIT laboratory, on the Université Paul Sabatier, campus of Toulouse. The recruited intern will be a full member of the research team, integrated with other team members, PhD students and permanent researches. He/she will participate to working groups, scientific seminars and other activities of our group.

Context

Professional pictures present strong color ambiances influencing the style and the mood of the image. These ambiances are usually set at the capture stage using light spots of different colors or adjusted at the compositing stage.

Professional softwares (such as Photoshop) provide different tools to change the color temperature or shift color hues. These filters are applied globally on the image.

Goal

Following recent works [1,2] and preliminary investigations, the rgb point cloud (fig 1 right) corresponding to an image depicts structures that can enable image manipulation.

The purpose of this internship is to analyze the rgb point cloud to extract meaningful geometrical structures. Using this structure, the student has to propose tool to edit the image.

A preliminary result is presented below

Fig1 Example of an image and its associated point cloud

Student profile

  • Master student in Computer Science or Applied Mathematics
  • Strong programming skills (C++), GPU programming (OpenGL)
  • Basic knowledge on linear algebra and optimization algorithms
  • Fluent English or French spoken

How to apply

Send your application to David Vanderhaeghe (see mail above)

  • a complete CV,
  • previous internship reports if available,
  • reference name/email address (optional)

Bibliography

[1]  Jianchao Tan, Jyh-Ming Lien, and Yotam Gingold. 2017. Decomposing images into layers via RGB-space geometry. ACM Trans. Graph. 36, 4, pages. DOI: https://doi.org/10.1145/3072959.2988229

[2]  Sylvain Duchêne, Carlos Aliaga, Tania Pouli, and Patrick Pérez. 2017. Mixed illumination analysis in single image for interactive color grading. In Proceedings of the Symposium on Non-Photorealistic Animation and Rendering (NPAR ’17), Stephen N. Spencer (Ed.). ACM, New York, NY, USA, Article 10, 10 pages. DOI: https://doi.org/10.1145/3092919.3092927

Master internship : Stroke based rendering by example

We are looking for a highly motivated Master student for a research internship.

  • Keywords: Stroke Based Rendering, Painterly Rendering, Realtime Rendering, Computer Graphics
  • Advisor: David Vanderhaeghe
  • Location: Laboratoire IRIT, STORM research team, Université Paul Sabatier – Toulouse
  • Duration: from February/March 2018, 5-7 months

The internship will take place in the IRIT laboratory, on the Université Paul Sabatier, campus of Toulouse.
The recruited intern will be a full member of the research team, integrated with other team members, PhD students and permanent researches. He/she will participate to working groups, scientific seminars and other activities of our group.

Context

Stylized images are ubiquitous in visual communication for animated movies, commercials or scientific illustrations. These images leave room for the spectator’s imagination and interpretation while conveying a strong and clear message. They bear the visual identity and ambiance of an art movement, an artist or a company. This is why it is essential for the content creator to be able to control the appearance — give his style — when creating a stylized image.
Our graphic design research project focuses on stroke based rendering, an expressive rendering  approach for the creation of stylized images.The goal is to understand which control structures are interesting for the creation of stylized images. These structures will provide new means of control that will adapt to the expertise, work habits, capacities and needs of content creators.

Objectives

The main topic of this master project is the definition and implementation of a automatic stroke based generator (fig 1). The generator style will be controlled by paint function to determine the shape of each stroke. Ideally these functions would be built by example given small user inputs. The selected student would have to study, adapt or invent new stroke based generation process, based on state of the art stroke based algorithms and propose example based control for this generator.

screenshot-from-2016-11-22-10-34-24


Fig 1. The painting on the canvas is composed of a set of strokes. Here stroke shape are depicted with on canvas and floating 3D shape to  catch their arrangement.

Student profile

  • Master student in Computer Science or Applied Mathematics
  • Strong programming skills (C++), GPU programming (OpenGL)
  • Basic knowledge on linear algebra and optimization algorithms
  • Fluent English or French spoken

How to apply

Send your application to David Vanderhaeghe (see mail above)

  • a complete CV,
  • previous internship reports if available,
  • reference name/email address (optional)

Master internship : VR for artistic work visualization

We are looking for a highly motivated Master student for a research internship.

  • Keywords: realtime rendering, virtual reality, art work visualization
  • Advisor: David Vanderhaeghe, Toma Popovici
  • Location: Laboratoire IRIT, équipe VORTEX (Groupe AGGA), Université Paul Sabatier – Toulouse
  • Duration: from February/March 2017, 5-7 months

The internship will take place in the IRIT laboratory, on the Université Paul Sabatier, campus of Toulouse.
The recruited intern will be a full member of the research team, integrated with other team members, PhD students and permanent researches. He/she will participate to working groups, scientific seminars and other activities of our group.

Context

Public access to art and culture is a major issue in our society.
Many collections, paintings for example, travel around the world to be exhibited in the biggest museums.
However, certain artistic works are difficult to transport, in relation to their size, their installation or their fragility.

In our case study, the observers come even inside the art-piece, and because they can’t resist touching the paint, it is prone to premature wear.

Also, in order to allow the greatest number of people to benefit from the art works without incurring transport costs or risks to the integrity of the art work, we wish to develop a process of acquisition and visualization of art works in virtual reality.

Objectives

The objective is to develop a 3D display system, with virtual reality device, allowing to reproduce the installation of Toma Popovici (see Fig. below), consisting of paintings for a total of 150 meters long and 1.5 meters height forming a labyrinth where the public goes through.

fig

Three pictures of a test setup of the art piece.

The different steps envisaged are:

  • Acquisition and preparation of data, test on a sub-set
  • Creating a sample scene
  • 3D display and validation with the artist on rendering quality
  • Complete data acquisition
  • Creation of an ad-hoc 3D modeling tool
  • VR display and validation with the artist

Student profile

  • Master student in Computer Science or Applied Mathematics
  • Strong programming skills (C++), GPU programming (OpenGL)
  • Basic knowledge on linear algebra and optimization algorithms
  • Basic knowledge on Unity, C#,
  • Fluent English or French spoken

How to apply

Send your application to David Vanderhaeghe (see mail above)

  • a complete CV,
  • previous internship reports if available,
  • reference name/email address (optional)

Master Internship : Path space analysis for user control

We are looking for a highly motivated Master student for a research internship.

  • Keywords: User Control of Rendering, Path Tracing, Ray Tracing, Computer Graphics
  • Advisor: David Vanderhaeghe
  • Location: Laboratoire IRIT, équipe VORTEX (Groupe AGGA), Université Paul Sabatier – Toulouse
  • Duration: from February/March 2017, 5-7 months

The internship will take place in the IRIT laboratory, on the Université Paul Sabatier, campus of Toulouse.
The recruited intern will be a full member of the research team, integrated with other team members, PhD students and permanent researches. He/she will participate to working groups, scientific seminars and other activities of our group.

Context

Physically based rendering, using path-space formulation of global illumination, has become a standard technique for high-quality computer-generated imagery. Nonetheless, being able to control and edit the resulting picture so that it corresponds to the artist vision is still a tedious trial-and-error process.  We introduce portals as a path-space manipulation tool to edit and control renderings and show how our editing tool unifies and extends previous work on lighting editing. Portals allow the artist to precisely control the final aspect of the image without modifying neither scene geometry nor lighting setup. According to the setup of two geometric handles and a simple path selection filter, portals capture specific lightpaths and teleport them through 3D space.

Here is the publication

Objectives

In this context, we are interested in a better understanding of the ray statistics that are meaningful to decompose an image. The project is to analyze data from ray paths computed by a bi-directional path-tracer and to segment rays in a set of perceptually motivated layers.

We also propose to extend portals to better behave with forward path tracer.

Student profile

  • Master student in Computer Science or Applied Mathematics
  • Strong programming skills (C++), GPU programming (OpenGL)
  • Basic knowledge on linear algebra and optimization algorithms
  • Fluent English or French spoken

How to apply

Send your application to David Vanderhaeghe (see mail above)

  • a complete CV,
  • previous internship reports if available,
  • reference name/email address (optional)

CG conference calendar

Computer graphics conference, deadlines and timelines (rebuttal).
We maintain this calendar whenever we submit a paper somewhere, but collaborative participation is welcomed, ask for write access.